summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-02 09:30:02 (UTC)
committer mickeyl <mickeyl>2004-04-02 09:30:02 (UTC)
commit40aa649f8f8a15df709ef65e43fa8fb1b7933b4a (patch) (unidiff)
treeb48f7036f60fe2875a288fd68072c40fd95abd87
parenta31c8ad914e72b874062dcb31e72476aca735bb0 (diff)
downloadopie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.zip
opie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.tar.gz
opie-40aa649f8f8a15df709ef65e43fa8fb1b7933b4a.tar.bz2
eliminate bogus CONFIG scope 'qtopia'. What does that mean? ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/server.pro2
-rw-r--r--core/tools/quicklauncher/quicklauncher.pro2
-rw-r--r--noncore/multimedia/opierec/opierec.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 441e3bf..053bb77 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -1,51 +1,51 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG += qtopia warn_on 3 CONFIG += qt warn_on
4 4
5 DESTDIR = $$(OPIEDIR)/bin 5 DESTDIR = $$(OPIEDIR)/bin
6 6
7 HEADERS += server.h \ 7 HEADERS += server.h \
8 serverinterface.h \ 8 serverinterface.h \
9 launchertab.h \ 9 launchertab.h \
10 documentlist.h \ 10 documentlist.h \
11 appicons.h \ 11 appicons.h \
12 taskbar.h \ 12 taskbar.h \
13 runningappbar.h \ 13 runningappbar.h \
14 applauncher.h \ 14 applauncher.h \
15 stabmon.h \ 15 stabmon.h \
16 inputmethods.h \ 16 inputmethods.h \
17 systray.h \ 17 systray.h \
18 wait.h \ 18 wait.h \
19 shutdownimpl.h \ 19 shutdownimpl.h \
20 launcher.h \ 20 launcher.h \
21 launcherview.h \ 21 launcherview.h \
22 $$(OPIEDIR)/core/apps/calibrate/calibrate.h \ 22 $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
23 startmenu.h \ 23 startmenu.h \
24 transferserver.h \ 24 transferserver.h \
25 qcopbridge.h \ 25 qcopbridge.h \
26 packageslave.h \ 26 packageslave.h \
27 irserver.h \ 27 irserver.h \
28 firstuse.h \ 28 firstuse.h \
29 $$(OPIEDIR)/rsync/buf.h \ 29 $$(OPIEDIR)/rsync/buf.h \
30 $$(OPIEDIR)/rsync/checksum.h \ 30 $$(OPIEDIR)/rsync/checksum.h \
31 $$(OPIEDIR)/rsync/command.h \ 31 $$(OPIEDIR)/rsync/command.h \
32 $$(OPIEDIR)/rsync/emit.h \ 32 $$(OPIEDIR)/rsync/emit.h \
33 $$(OPIEDIR)/rsync/job.h \ 33 $$(OPIEDIR)/rsync/job.h \
34 $$(OPIEDIR)/rsync/netint.h \ 34 $$(OPIEDIR)/rsync/netint.h \
35 $$(OPIEDIR)/rsync/protocol.h \ 35 $$(OPIEDIR)/rsync/protocol.h \
36 $$(OPIEDIR)/rsync/prototab.h \ 36 $$(OPIEDIR)/rsync/prototab.h \
37 $$(OPIEDIR)/rsync/rsync.h \ 37 $$(OPIEDIR)/rsync/rsync.h \
38 $$(OPIEDIR)/rsync/search.h \ 38 $$(OPIEDIR)/rsync/search.h \
39 $$(OPIEDIR)/rsync/stream.h \ 39 $$(OPIEDIR)/rsync/stream.h \
40 $$(OPIEDIR)/rsync/sumset.h \ 40 $$(OPIEDIR)/rsync/sumset.h \
41 $$(OPIEDIR)/rsync/trace.h \ 41 $$(OPIEDIR)/rsync/trace.h \
42 $$(OPIEDIR)/rsync/types.h \ 42 $$(OPIEDIR)/rsync/types.h \
43 $$(OPIEDIR)/rsync/util.h \ 43 $$(OPIEDIR)/rsync/util.h \
44 $$(OPIEDIR)/rsync/whole.h \ 44 $$(OPIEDIR)/rsync/whole.h \
45 $$(OPIEDIR)/rsync/config_rsync.h \ 45 $$(OPIEDIR)/rsync/config_rsync.h \
46 $$(OPIEDIR)/rsync/qrsync.h \ 46 $$(OPIEDIR)/rsync/qrsync.h \
47 syncdialog.h \ 47 syncdialog.h \
48 serverapp.h \ 48 serverapp.h \
49 qprocess.h \ 49 qprocess.h \
50 screensaver.h \ 50 screensaver.h \
51 $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \ 51 $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
diff --git a/core/tools/quicklauncher/quicklauncher.pro b/core/tools/quicklauncher/quicklauncher.pro
index 3cdbf60..927392d 100644
--- a/core/tools/quicklauncher/quicklauncher.pro
+++ b/core/tools/quicklauncher/quicklauncher.pro
@@ -1,15 +1,15 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qtopia warn_on 2 CONFIG += qt warn_on
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS = dropins.h 5 HEADERS = dropins.h
6 SOURCES = main.cpp 6 SOURCES = main.cpp
7 INTERFACES= 7 INTERFACES=
8 8
9 INCLUDEPATH+= $(OPIEDIR)/include 9 INCLUDEPATH+= $(OPIEDIR)/include
10 LIBS += -lqpe -lopiecore2 -lopieui2 10 LIBS += -lqpe -lopiecore2 -lopieui2
11 11
12 TARGET = quicklauncher 12 TARGET = quicklauncher
13 13
14 14
15include ( $(OPIEDIR)/include.pro ) 15include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 080a5f2..7b08f0e 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,41 +1,41 @@
1#CONFIG = qt qtopia warn_on pdaudio 1#CONFIG = qt warn_on pdaudio
2CONFIG = qt warn_on opie 2CONFIG = qt warn_on opie
3#CONFIG = qt warn_on quick-app 3#CONFIG = qt warn_on quick-app
4HEADERS = adpcm.h \ 4HEADERS = adpcm.h \
5 pixmaps.h \ 5 pixmaps.h \
6 helpwindow.h \ 6 helpwindow.h \
7 qtrec.h \ 7 qtrec.h \
8 device.h \ 8 device.h \
9 wavFile.h \ 9 wavFile.h \
10 waveform.h 10 waveform.h
11SOURCES = adpcm.c \ 11SOURCES = adpcm.c \
12 helpwindow.cpp \ 12 helpwindow.cpp \
13 main.cpp \ 13 main.cpp \
14 qtrec.cpp \ 14 qtrec.cpp \
15 device.cpp \ 15 device.cpp \
16 wavFile.cpp \ 16 wavFile.cpp \
17 waveform.cpp 17 waveform.cpp
18INTERFACES = 18INTERFACES =
19 19
20contains(CONFIG, pdaudio) { 20contains(CONFIG, pdaudio) {
21# LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz 21# LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
22 LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2 22 LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
23 INCLUDEPATH += $(QPEDIR)/include 23 INCLUDEPATH += $(QPEDIR)/include
24 DEPENDPATH += $(QPEDIR)/include 24 DEPENDPATH += $(QPEDIR)/include
25 DEFINES += PDAUDIO 25 DEFINES += PDAUDIO
26 DEFINES += THREADED 26 DEFINES += THREADED
27 TARGET = qperec 27 TARGET = qperec
28 28
29# DESTDIR=$(QPEDIR)/bin 29# DESTDIR=$(QPEDIR)/bin
30} 30}
31 31
32contains(CONFIG, opie) { 32contains(CONFIG, opie) {
33 INCLUDEPATH += $(OPIEDIR)/include 33 INCLUDEPATH += $(OPIEDIR)/include
34 DEPENDPATH += $(OPIEDIR)/include 34 DEPENDPATH += $(OPIEDIR)/include
35 DESTDIR=$(OPIEDIR)/bin 35 DESTDIR=$(OPIEDIR)/bin
36 LIBS += -lqpe -lopiecore2 -lpthread 36 LIBS += -lqpe -lopiecore2 -lpthread
37 TARGET = opierec 37 TARGET = opierec
38 include ( $(OPIEDIR)/include.pro ) 38 include ( $(OPIEDIR)/include.pro )
39} 39}
40 40
41 41