9 files changed, 10 insertions, 10 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