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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = battery.h batterystatus.h SOURCES = battery.cpp batterystatus.cpp TARGET = batteryapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = clipboard.h SOURCES = clipboard.cpp TARGET = clipboardapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = clock.h SOURCES = clock.cpp TARGET = clockapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = irda.h SOURCES = irda.cpp TARGET = irdaapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = multikey.h SOURCES = multikey.cpp TARGET = multikeyapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,13 +2,13 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = restart.h restartappletimpl.h SOURCES = restart.cpp restartappletimpl.cpp TARGET = restartapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe VERSION = 1.0.0 MOC_DIR=opieobj OBJECTS_DIR=opieobj 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = screenshot.h inputDialog.h SOURCES = screenshot.cpp inputDialog.cpp TARGET = screenshotapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = volume.h oledbox.h SOURCES = volume.cpp oledbox.cpp TARGET = volumeapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -6,11 +6,11 @@ SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ program.cc sound.cc text.cc TARGET = flashplugin DESTDIR = ../../plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) 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 @@ -4,13 +4,13 @@ HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h dec layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp TARGET = madplugin DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe -lm VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) DEFINES += FPM_INTEL 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 @@ -39,11 +39,11 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ video/slice.c \ video/vlc.c TARGET = mpeg3plugin TMAKE_CC=$(CXX) DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe -lpthread -lm VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) 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 @@ -2,11 +2,11 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = wavplugin.h wavpluginimpl.h SOURCES = wavplugin.cpp wavpluginimpl.cpp TARGET = wavplugin DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. -DEPENDPATH += ../$(OPIEDIR)/include .. +DEPENDPATH += .. LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt warn_on HEADERS = obex.h obexhandler.h obexsend.h receiver.h obeximpl.h SOURCES = obex.cc obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp TARGET = opieobex DESTDIR = $(OPIEDIR)/plugins/obex INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 VERSION = 0.0.2 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/applets 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 @@ -1,11 +1,11 @@ CONFIG += qt warn_on quick-app HEADERS = light.h sensor.h calibration.h SOURCES = light.cpp main.cpp sensor.cpp calibration.cpp INTERFACES = lightsettingsbase.ui sensorbase.ui INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 TARGET = light-and-power include ( $(OPIEDIR)/include.pro ) 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 @@ -1,10 +1,10 @@ CONFIG += qt warn_on quick-app HEADERS = security.h SOURCES = security.cpp main.cpp INTERFACES = securitybase.ui INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 TARGET = security include ( $(OPIEDIR)/include.pro ) 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 @@ -2,11 +2,11 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = exampleboardimpl.h SOURCES = exampleboardimpl.cpp TARGET = example_board DESTDIR = $(OPIEDIR)/plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include ../../launcher +DEPENDPATH += ../../launcher LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) 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 @@ -40,13 +40,13 @@ SOURCES = Alphabet.cpp \ QtDasherImpl.cc \ QtDasherPlugin.cc \ QtDasherScreen.cc TARGET = qdasher DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include ../../launcher +DEPENDPATH += ../../launcher LIBS += -lqpe QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods VERSION = 1.0.0 SUBDIRS = DasherCore 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 @@ -4,13 +4,13 @@ HEADERS = dvorak.h \ dvorakimpl.h SOURCES = dvorak.cpp \ dvorakimpl.cpp 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 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/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 @@ -23,12 +23,12 @@ SOURCES = qimpenchar.cpp \ qimpenwordpick.cpp \ handwritingimpl.cpp INTERFACES = qimpenprefbase.ui TARGET = qhandwriting DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include ../../launcher +DEPENDPATH += ../../launcher LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/inputmethods 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 @@ -4,13 +4,13 @@ HEADERS = keyboard.h \ keyboardimpl.h SOURCES = keyboard.cpp \ keyboardimpl.cpp 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 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/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 @@ -6,13 +6,13 @@ HEADERS = keyboard.h \ SOURCES = keyboard.cpp \ configdlg.cpp \ keyboardimpl.cpp 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 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release HEADERS = pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h SOURCES = pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp TARGET = qpickboard DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include ../../launcher +DEPENDPATH += ../../launcher LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/inputmethods 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 @@ -2,12 +2,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release HEADERS = unikeyboard.h unikeyboardimpl.h SOURCES = unikeyboard.cpp unikeyboardimpl.cpp TARGET = qunikeyboard DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include ../../launcher +DEPENDPATH += ../../launcher LIBS += -lqpe VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) target.path = $$prefix/plugins/inputmethods 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 @@ -12,11 +12,11 @@ SOURCES = ../../settings/sysinfo/graph.cpp \ memorymeter.cpp \ memorystatus.cpp \ swapfile.cpp TARGET = memoryapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += VERSION = 1.0.0 LIBS += -lqpe -lopiecore2 -lopieui2 include ( $(OPIEDIR)/include.pro ) 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 @@ -10,11 +10,11 @@ SOURCES = zkbwidget.cpp \ ../../apps/keyz-cfg/zkbnames.cpp \ ../../apps/keyz-cfg/zkbxml.cpp \ ../../apps/keyz-cfg/zkb.cpp TARGET = zkbapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include ../../apps/keyz-cfg -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += VERSION = 0.6.0 LIBS += -lqpe include ( $(OPIEDIR)/include.pro ) 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 @@ -1,11 +1,10 @@ TEMPLATE = lib CONFIG += qte warn_on HEADERS = connection.h parser.h device.h manager.h remotedevice.h services.h startpanconnection.h startdunconnection.h SOURCES = connection.cpp parser.cc device.cc manager.cc remotedevice.cc services.cc startpanconnection.cpp startdunconnection.cpp 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 @@ -1,10 +1,10 @@ CONFIG += qt warn_on quick-app HEADERS = doctab.h SOURCES = doctab.cpp main.cpp INTERFACES = doctabsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 TARGET = doctab include ( $(OPIEDIR)/include.pro ) 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 @@ -1,10 +1,10 @@ CONFIG += qt warn_on quick-app HEADERS = settings.h SOURCES = language.cpp main.cpp INTERFACES = languagesettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += ../$(OPIEDIR)/include +DEPENDPATH += LIBS += -lqpe -lopiecore2 TARGET = language include ( $(OPIEDIR)/include.pro ) |