summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro2
-rw-r--r--core/applets/clipboardapplet/clipboardapplet.pro2
-rw-r--r--core/applets/clockapplet/clockapplet.pro2
-rw-r--r--core/applets/irdaapplet/irdaapplet.pro2
-rw-r--r--core/applets/multikeyapplet/multikeyapplet.pro2
-rw-r--r--core/applets/restartapplet/restartapplet.pro2
-rw-r--r--core/applets/screenshotapplet/screenshotapplet.pro2
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro2
-rw-r--r--core/multimedia/opieplayer/libflash/libflash.pro2
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro2
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro2
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.pro2
-rw-r--r--core/obex/obex.pro2
-rw-r--r--core/settings/light-and-power/light-and-power.pro2
-rw-r--r--core/settings/security/security.pro2
-rw-r--r--examples/inputmethod/example.pro2
-rw-r--r--inputmethods/dasher/dasher.pro2
-rw-r--r--inputmethods/dvorak/dvorak.pro2
-rw-r--r--inputmethods/handwriting/handwriting.pro2
-rw-r--r--inputmethods/keyboard/keyboard.pro2
-rw-r--r--inputmethods/multikey/multikey.pro2
-rw-r--r--inputmethods/pickboard/pickboard.pro2
-rw-r--r--inputmethods/unikeyboard/unikeyboard.pro2
-rw-r--r--noncore/applets/memoryapplet/memoryapplet.pro2
-rw-r--r--noncore/applets/zkbapplet/zkbapplet.pro2
-rw-r--r--noncore/net/opietooth/lib/lib.pro3
-rw-r--r--noncore/settings/doctab/doctab.pro2
-rw-r--r--noncore/settings/language/language.pro2
28 files changed, 28 insertions, 29 deletions
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index 51eb101..f201db9 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -6,5 +6,5 @@ TARGET = batteryapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 1e36e1f..ba37e30 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -6,5 +6,5 @@ TARGET = clipboardapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 0e1d410..b681f5c 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -6,5 +6,5 @@ TARGET = clockapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index f83ba8a..ea0e752 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -6,5 +6,5 @@ TARGET = irdaapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro
index 30ce98e..d386998 100644
--- a/core/applets/multikeyapplet/multikeyapplet.pro
+++ b/core/applets/multikeyapplet/multikeyapplet.pro
@@ -6,5 +6,5 @@ TARGET = multikeyapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/restartapplet/restartapplet.pro b/core/applets/restartapplet/restartapplet.pro
index 51f97d3..d8323ed 100644
--- a/core/applets/restartapplet/restartapplet.pro
+++ b/core/applets/restartapplet/restartapplet.pro
@@ -6,5 +6,5 @@ TARGET = restartapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 1714b32..e214643 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -6,5 +6,5 @@ TARGET = screenshotapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index d5d7467..4db3d12 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -6,5 +6,5 @@ TARGET = volumeapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index 2b2b5c8..eacd391 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -10,5 +10,5 @@ TARGET = flashplugin
DESTDIR = ../../plugins/codecs
INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 8c5d06d..646726c 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -8,5 +8,5 @@ TARGET = madplugin
DESTDIR = $(OPIEDIR)/plugins/codecs
INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index 6eb23a6..deb0cc2 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -43,5 +43,5 @@ TMAKE_CC=$(CXX)
DESTDIR = $(OPIEDIR)/plugins/codecs
INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe -lpthread -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 0267e02..76aa736 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -6,5 +6,5 @@ TARGET = wavplugin
DESTDIR = $(OPIEDIR)/plugins/codecs
INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH += ../$(OPIEDIR)/include ..
+DEPENDPATH += ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index f07a4e8..2c2f38c 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -6,5 +6,5 @@ TARGET = opieobex
DESTDIR = $(OPIEDIR)/plugins/obex
INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
VERSION = 0.0.2
diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro
index 79a6f44..caa4dbd 100644
--- a/core/settings/light-and-power/light-and-power.pro
+++ b/core/settings/light-and-power/light-and-power.pro
@@ -4,5 +4,5 @@ SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp
INTERFACES = lightsettingsbase.ui sensorbase.ui
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 4c1e68b..fca37ad 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -4,5 +4,5 @@ SOURCES = security.cpp main.cpp
INTERFACES = securitybase.ui
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
TARGET = security
diff --git a/examples/inputmethod/example.pro b/examples/inputmethod/example.pro
index b3cfc6b..124d10a 100644
--- a/examples/inputmethod/example.pro
+++ b/examples/inputmethod/example.pro
@@ -6,5 +6,5 @@ TARGET = example_board
DESTDIR = $(OPIEDIR)/plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/inputmethods/dasher/dasher.pro b/inputmethods/dasher/dasher.pro
index b7669a4..607fa6d 100644
--- a/inputmethods/dasher/dasher.pro
+++ b/inputmethods/dasher/dasher.pro
@@ -44,5 +44,5 @@ TARGET = qdasher
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe
QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 68c010f..91b3608 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -8,5 +8,5 @@ TARGET = qdvorak
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index e6f3b3f..b343e54 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -27,5 +27,5 @@ TARGET = qhandwriting
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 1fab50f..57b39e8 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -8,5 +8,5 @@ TARGET = qkeyboard
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 3a7de06..f14dc01 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -10,5 +10,5 @@ TARGET = qmultikey
DESTDIR = $(OPIEDIR)/plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2
QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro
index 3c1734c..2551977 100644
--- a/inputmethods/pickboard/pickboard.pro
+++ b/inputmethods/pickboard/pickboard.pro
@@ -6,5 +6,5 @@ TARGET = qpickboard
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro
index 64937d0..9f468c4 100644
--- a/inputmethods/unikeyboard/unikeyboard.pro
+++ b/inputmethods/unikeyboard/unikeyboard.pro
@@ -6,5 +6,5 @@ TARGET = qunikeyboard
DESTDIR = ../../plugins/inputmethods
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
+DEPENDPATH += ../../launcher
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index 7cc6401..8ae14c5 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -16,5 +16,5 @@ TARGET = memoryapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
VERSION = 1.0.0
LIBS += -lqpe -lopiecore2 -lopieui2
diff --git a/noncore/applets/zkbapplet/zkbapplet.pro b/noncore/applets/zkbapplet/zkbapplet.pro
index 1a739f8..d270c28 100644
--- a/noncore/applets/zkbapplet/zkbapplet.pro
+++ b/noncore/applets/zkbapplet/zkbapplet.pro
@@ -14,5 +14,5 @@ TARGET = zkbapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include ../../apps/keyz-cfg
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
VERSION = 0.6.0
LIBS += -lqpe
diff --git a/noncore/net/opietooth/lib/lib.pro b/noncore/net/opietooth/lib/lib.pro
index e1404c8..59851ff 100644
--- a/noncore/net/opietooth/lib/lib.pro
+++ b/noncore/net/opietooth/lib/lib.pro
@@ -5,7 +5,6 @@ SOURCES = connection.cpp parser.cc device.cc manager.cc remotedevice.cc service
TARGET = opietooth1
INCLUDEPATH += $(OPIEDIR)/include .
-DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
+DESTDIR = $(OPIEDIR)/lib
LIBS += -lopiecore2
-#VERSION = 0.0.0
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/doctab/doctab.pro b/noncore/settings/doctab/doctab.pro
index 38a6ceb..98b189f 100644
--- a/noncore/settings/doctab/doctab.pro
+++ b/noncore/settings/doctab/doctab.pro
@@ -4,5 +4,5 @@ SOURCES = doctab.cpp main.cpp
INTERFACES = doctabsettingsbase.ui
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
TARGET = doctab
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro
index 263dde8..3d09f0a 100644
--- a/noncore/settings/language/language.pro
+++ b/noncore/settings/language/language.pro
@@ -4,5 +4,5 @@ SOURCES = language.cpp main.cpp
INTERFACES = languagesettingsbase.ui
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH +=
LIBS += -lqpe -lopiecore2
TARGET = language