author | zecke <zecke> | 2002-06-21 14:15:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-21 14:15:04 (UTC) |
commit | ab08162e2b10fdd4844e2864f445c6b125ce4f60 (patch) (unidiff) | |
tree | aaf7e0acc13efa2e58c19b191375c7a40cff6893 /core | |
parent | e6834009bf23492e009258e3881ce183cf9e27a0 (diff) | |
download | opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.zip opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.tar.gz opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.tar.bz2 |
Fix compilation
-rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboardapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clockapplet/clockapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irdaapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/obex/obex.pro | 4 | ||||
-rw-r--r-- | core/applets/obex/obeximpl.h | 2 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshotapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.pro | 2 | ||||
-rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 2 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 8 | ||||
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 2 | ||||
-rw-r--r-- | core/settings/security/security.pro | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index 9cf7556..b854b89 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= battery.h batterystatus.h batteryappletimpl.h | 3 | HEADERS= battery.h batterystatus.h batteryappletimpl.h |
4 | SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp | 4 | SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp |
5 | TARGET = batteryapplet | 5 | TARGET = batteryapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index 71e2bbe..36fbc49 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= clipboard.h clipboardappletimpl.h | 3 | HEADERS= clipboard.h clipboardappletimpl.h |
4 | SOURCES= clipboard.cpp clipboardappletimpl.cpp | 4 | SOURCES= clipboard.cpp clipboardappletimpl.cpp |
5 | TARGET = clipboardapplet | 5 | TARGET = clipboardapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro index 85e3316..2dc1784 100644 --- a/core/applets/clockapplet/clockapplet.pro +++ b/core/applets/clockapplet/clockapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= clock.h clockappletimpl.h | 3 | HEADERS= clock.h clockappletimpl.h |
4 | SOURCES= clock.cpp clockappletimpl.cpp | 4 | SOURCES= clock.cpp clockappletimpl.cpp |
5 | TARGET = clockapplet | 5 | TARGET = clockapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro index bfcfc3f..035b0c1 100644 --- a/core/applets/irdaapplet/irdaapplet.pro +++ b/core/applets/irdaapplet/irdaapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS = irda.h irdaappletimpl.h | 3 | HEADERS = irda.h irdaappletimpl.h |
4 | SOURCES = irda.cpp irdaappletimpl.cpp | 4 | SOURCES = irda.cpp irdaappletimpl.cpp |
5 | TARGET = irdaapplet | 5 | TARGET = irdaapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/obex/obex.pro b/core/applets/obex/obex.pro index 6915737..a8c2340 100644 --- a/core/applets/obex/obex.pro +++ b/core/applets/obex/obex.pro | |||
@@ -3,8 +3,8 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= obex.h obeximpl.h | 3 | HEADERS= obex.h obeximpl.h |
4 | SOURCES= obex.cc obeximpl.cc | 4 | SOURCES= obex.cc obeximpl.cc |
5 | TARGET = opieobex | 5 | TARGET = opieobex |
6 | DESTDIR = ../../plugins/obex | 6 | DESTDIR = $(OPIEDIR)/plugins/obex |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | INTERFACES = obexinc.ui obexdlg.ui | 9 | INTERFACES = obexinc.ui obexdlg.ui |
10 | LIBS += -lqpe -lopie | 10 | LIBS += -lqpe -lopie |
diff --git a/core/applets/obex/obeximpl.h b/core/applets/obex/obeximpl.h index 8d10cf1..78d5b25 100644 --- a/core/applets/obex/obeximpl.h +++ b/core/applets/obex/obeximpl.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #define OpieObexImpl_H | 3 | #define OpieObexImpl_H |
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include "../obexinterface.h" | 6 | #include <obexinterface.h> |
7 | #include "obexdlg.h" | 7 | #include "obexdlg.h" |
8 | #include "obexinc.h" | 8 | #include "obexinc.h" |
9 | #include <qpe/qcopenvelope_qws.h> | 9 | #include <qpe/qcopenvelope_qws.h> |
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro index e3c5440..6b97a2d 100644 --- a/core/applets/screenshotapplet/screenshotapplet.pro +++ b/core/applets/screenshotapplet/screenshotapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS = screenshot.h screenshotappletimpl.h | 3 | HEADERS = screenshot.h screenshotappletimpl.h |
4 | SOURCES = screenshot.cpp screenshotappletimpl.cpp | 4 | SOURCES = screenshot.cpp screenshotappletimpl.cpp |
5 | TARGET = screenshotapplet | 5 | TARGET = screenshotapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro index f7cc439..298d989 100644 --- a/core/applets/vmemo/vmemo.pro +++ b/core/applets/vmemo/vmemo.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= vmemo.h vmemoimpl.h | 3 | HEADERS= vmemo.h vmemoimpl.h |
4 | SOURCES= vmemo.cpp vmemoimpl.cpp | 4 | SOURCES= vmemo.cpp vmemoimpl.cpp |
5 | TARGET = vmemoapplet | 5 | TARGET = vmemoapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR =$(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index 54404bf..f89eea2 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro | |||
@@ -3,7 +3,7 @@ CONFIG += qt warn_on release | |||
3 | HEADERS= volume.h volumeappletimpl.h | 3 | HEADERS= volume.h volumeappletimpl.h |
4 | SOURCES= volume.cpp volumeappletimpl.cpp | 4 | SOURCES= volume.cpp volumeappletimpl.cpp |
5 | TARGET = volumeapplet | 5 | TARGET = volumeapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index b8e9236..182cd1f 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro | |||
@@ -20,7 +20,7 @@ HEADERS = background.h \ | |||
20 | shutdownimpl.h \ | 20 | shutdownimpl.h \ |
21 | launcher.h \ | 21 | launcher.h \ |
22 | launcherview.h \ | 22 | launcherview.h \ |
23 | ../calibrate/calibrate.h \ | 23 | $(OPIEDIR)/core/apps/calibrate/calibrate.h \ |
24 | startmenu.h \ | 24 | startmenu.h \ |
25 | transferserver.h \ | 25 | transferserver.h \ |
26 | qcopbridge.h \ | 26 | qcopbridge.h \ |
@@ -62,7 +62,7 @@ SOURCES = background.cpp \ | |||
62 | shutdownimpl.cpp \ | 62 | shutdownimpl.cpp \ |
63 | launcher.cpp \ | 63 | launcher.cpp \ |
64 | launcherview.cpp \ | 64 | launcherview.cpp \ |
65 | $(OPIEDIR)/calibrate/calibrate.cpp \ | 65 | $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ |
66 | transferserver.cpp \ | 66 | transferserver.cpp \ |
67 | packageslave.cpp \ | 67 | packageslave.cpp \ |
68 | irserver.cpp \ | 68 | irserver.cpp \ |
@@ -101,8 +101,8 @@ INTERFACES = shutdown.ui syncdialog.ui | |||
101 | INCLUDEPATH += $(OPIEDIR)/include | 101 | INCLUDEPATH += $(OPIEDIR)/include |
102 | DEPENDPATH+= $(OPIEDIR)/include . | 102 | DEPENDPATH+= $(OPIEDIR)/include . |
103 | 103 | ||
104 | INCLUDEPATH += $(OPIEDIR)/calibrate | 104 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate |
105 | DEPENDPATH+= $(OPIEDIR)/calibrate | 105 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate |
106 | 106 | ||
107 | INCLUDEPATH += $(OPIEDIR)/rsync | 107 | INCLUDEPATH += $(OPIEDIR)/rsync |
108 | DEPENDPATH+= $(OPIEDIR)/rsync | 108 | DEPENDPATH+= $(OPIEDIR)/rsync |
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 7e2afed..eb4a0db 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = settings.h | 4 | HEADERS = settings.h |
5 | SOURCES = light.cpp main.cpp | 5 | SOURCES = light.cpp main.cpp |
6 | INTERFACES= lightsettingsbase.ui | 6 | INTERFACES= lightsettingsbase.ui |
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 1e815ac..6b28485 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = security.h | 4 | HEADERS = security.h |
5 | SOURCES = security.cpp main.cpp | 5 | SOURCES = security.cpp main.cpp |
6 | INTERFACES= securitybase.ui | 6 | INTERFACES= securitybase.ui |