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
@@ -1,18 +1,18 @@
         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
 
 TRANSLATIONS = ../../i18n/de/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/es/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/pt/libbatteryapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/en/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/hu/libbatteryapplet.ts
 TRANSLATIONS   += ../../i18n/ja/libbatteryapplet.ts
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
@@ -1,14 +1,14 @@
         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
 
 TRANSLATIONS = ../../i18n/pt_BR/libclipboardapplet.ts
 TRANSLATIONS += ../../i18n/es/libclipboardapplet.ts
 TRANSLATIONS += ../../i18n/pt/libclipboardapplet.ts
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
@@ -1,15 +1,15 @@
         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
 
 TRANSLATIONS = ../../i18n/de/libclockapplet.ts
 TRANSLATIONS += ../../i18n/es/libclockapplet.ts
 TRANSLATIONS += ../../i18n/pt/libclockapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libclockapplet.ts
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
@@ -1,18 +1,18 @@
 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
 
 TRANSLATIONS = ../../i18n/de/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/en/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/es/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts
 TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts
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
@@ -1,12 +1,12 @@
         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
@@ -1,18 +1,18 @@
 
 #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>
 
 namespace OpieObex {
   class Obex;
   class ObexImpl  :  public QObject, public ObexInterface {
     Q_OBJECT
   public:
     ObexImpl();
     virtual ~ObexImpl();
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
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
@@ -1,18 +1,18 @@
 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
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
 TRANSLATIONS = ../../i18n/pt_BR/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/pt/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/de/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/en/libscreenshotapplet.ts
 TRANSLATIONS += ../../i18n/es/libscreenshotapplet.ts
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
@@ -1,14 +1,14 @@
         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
 
 TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/es/libvmemoapplet.ts
 TRANSLATIONS += ../../i18n/pt/libvmemoapplet.ts
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
@@ -1,15 +1,15 @@
         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
 
 TRANSLATIONS = ../../i18n/de/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/es/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/pt/libvolumeapplet.ts
 TRANSLATIONS += ../../i18n/pt_BR/libvolumeapplet.ts
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
@@ -11,25 +11,25 @@ HEADERS		= background.h \
                   info.h \
                   appicons.h \
                   taskbar.h \
                   sidething.h \
                   mrulist.h \
                   stabmon.h \
                   inputmethods.h \
                   systray.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 \
                 irserver.h \
         $(OPIEDIR)/rsync/buf.h \
         $(OPIEDIR)/rsync/checksum.h \
         $(OPIEDIR)/rsync/command.h \
         $(OPIEDIR)/rsync/emit.h \
         $(OPIEDIR)/rsync/job.h \
         $(OPIEDIR)/rsync/netint.h \
         $(OPIEDIR)/rsync/protocol.h \
@@ -53,25 +53,25 @@ SOURCES		= background.cpp \
                   info.cpp \
                   appicons.cpp \
                   taskbar.cpp \
                   sidething.cpp \
                   mrulist.cpp \
                   stabmon.cpp \
                   inputmethods.cpp \
                   systray.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 \
                   startmenu.cpp \
                   main.cpp \
         $(OPIEDIR)/rsync/base64.c \
         $(OPIEDIR)/rsync/buf.c \
         $(OPIEDIR)/rsync/checksum.c \
         $(OPIEDIR)/rsync/command.c \
         $(OPIEDIR)/rsync/delta.c \
         $(OPIEDIR)/rsync/emit.c \
@@ -92,26 +92,26 @@ SOURCES		= background.cpp \
         $(OPIEDIR)/rsync/trace.c \
         $(OPIEDIR)/rsync/tube.c \
         $(OPIEDIR)/rsync/util.c \
         $(OPIEDIR)/rsync/version.c \
         $(OPIEDIR)/rsync/whole.c \
         $(OPIEDIR)/rsync/qrsync.cpp
 
         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
 
         TARGET  = qpe
 
         LIBS    += -lqpe -lcrypt -lopie
 
 TRANSLATIONS = ../i18n/de/qpe.ts
 TRANSLATIONS += ../i18n/es/qpe.ts
 TRANSLATIONS += ../i18n/pt/qpe.ts
 TRANSLATIONS += ../i18n/pt_BR/qpe.ts
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,15 +1,15 @@
         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
         DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = light-and-power
 
 TRANSLATIONS   = ../../i18n/de/light-and-power.ts
 TRANSLATIONS   += ../../i18n/es/light-and-power.ts
 TRANSLATIONS   += ../../i18n/pt/light-and-power.ts
 TRANSLATIONS   += ../../i18n/pt_BR/light-and-power.ts
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,15 +1,15 @@
         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
         DEPENDPATH+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
         TARGET  = security
 
 TRANSLATIONS    = ../../i18n/pt_BR/security.ts
 TRANSLATIONS    += ../../i18n/es/security.ts
 TRANSLATIONS    += ../../i18n/pt/security.ts
 TRANSLATIONS   += ../../i18n/de/security.ts