-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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = battery.h batterystatus.h batteryappletimpl.h SOURCES = battery.cpp batterystatus.cpp batteryappletimpl.cpp TARGET = batteryapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clipboard.h clipboardappletimpl.h SOURCES = clipboard.cpp clipboardappletimpl.cpp TARGET = clipboardapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = clock.h clockappletimpl.h SOURCES = clock.cpp clockappletimpl.cpp TARGET = clockapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = irda.h irdaappletimpl.h SOURCES = irda.cpp irdaappletimpl.cpp TARGET = irdaapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,10 +2,10 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = obex.h obeximpl.h SOURCES = obex.cc obeximpl.cc TARGET = opieobex -DESTDIR = ../../plugins/obex -INCLUDEPATH += $(OPIEDIR)/include +DESTDIR = $(OPIEDIR)/plugins/obex +INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher DEPENDPATH += ../$(OPIEDIR)/include INTERFACES = obexinc.ui obexdlg.ui LIBS += -lqpe -lopie VERSION = 0.0.1 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 @@ -2,9 +2,9 @@ #ifndef OpieObexImpl_H #define OpieObexImpl_H #include <qobject.h> -#include "../obexinterface.h" +#include <obexinterface.h> #include "obexdlg.h" #include "obexinc.h" #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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = screenshot.h screenshotappletimpl.h SOURCES = screenshot.cpp screenshotappletimpl.cpp TARGET = screenshotapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = vmemo.h vmemoimpl.h SOURCES = vmemo.cpp vmemoimpl.cpp TARGET = vmemoapplet -DESTDIR = ../../plugins/applets +DESTDIR =$(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 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 @@ -2,9 +2,9 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = volume.h volumeappletimpl.h SOURCES = volume.cpp volumeappletimpl.cpp TARGET = volumeapplet -DESTDIR = ../../plugins/applets +DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 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 @@ -19,9 +19,9 @@ HEADERS = background.h \ wait.h \ shutdownimpl.h \ launcher.h \ launcherview.h \ - ../calibrate/calibrate.h \ + $(OPIEDIR)/core/apps/calibrate/calibrate.h \ startmenu.h \ transferserver.h \ qcopbridge.h \ packageslave.h \ @@ -61,9 +61,9 @@ SOURCES = background.cpp \ wait.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(OPIEDIR)/calibrate/calibrate.cpp \ + $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ @@ -100,10 +100,10 @@ INTERFACES = shutdown.ui syncdialog.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include . -INCLUDEPATH += $(OPIEDIR)/calibrate -DEPENDPATH += $(OPIEDIR)/calibrate +INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate +DEPENDPATH += $(OPIEDIR)/core/apps/calibrate INCLUDEPATH += $(OPIEDIR)/rsync 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,7 +1,7 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = settings.h SOURCES = light.cpp main.cpp INTERFACES = lightsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include 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,7 +1,7 @@ TEMPLATE = app CONFIG += qt warn_on release -DESTDIR = ../../bin +DESTDIR = $(OPIEDIR)/bin HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui INCLUDEPATH += $(OPIEDIR)/include |