author | zecke <zecke> | 2002-06-21 14:15:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-21 14:15:04 (UTC) |
commit | ab08162e2b10fdd4844e2864f445c6b125ce4f60 (patch) (unidiff) | |
tree | aaf7e0acc13efa2e58c19b191375c7a40cff6893 | |
parent | e6834009bf23492e009258e3881ce183cf9e27a0 (diff) | |
download | opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.zip opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.tar.gz opie-ab08162e2b10fdd4844e2864f445c6b125ce4f60.tar.bz2 |
Fix compilation
-rw-r--r-- | Makefile | 124 | ||||
-rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboardapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clockapplet/clockapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irdaapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/obex/obex.pro | 4 | ||||
-rw-r--r-- | core/applets/obex/obeximpl.h | 2 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshotapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.pro | 2 | ||||
-rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 2 | ||||
-rw-r--r-- | core/launcher/launcher.pro | 8 | ||||
-rw-r--r-- | core/settings/light-and-power/light-and-power.pro | 2 | ||||
-rw-r--r-- | core/settings/security/security.pro | 2 | ||||
-rw-r--r-- | noncore/settings/language/language.pro | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediummount.pro | 2 | ||||
-rw-r--r-- | noncore/settings/sound/sound.pro | 2 |
16 files changed, 91 insertions, 71 deletions
@@ -3,61 +3,81 @@ indefault: dynamic | |||
3 | all: default docs | 3 | all: default docs |
4 | 4 | ||
5 | LIBS=library libopie | 5 | LIBS=library libopie |
6 | 6 | ||
7 | COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ | 7 | |
8 | inputmethods/pickboard \ | 8 | INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \ |
9 | inputmethods/handwriting \ | 9 | inputmethods/handwriting inputmethods/unikeyboard \ |
10 | inputmethods/unikeyboard \ | 10 | inputmethods/jumpx inputmethods/kjumpx \ |
11 | inputmethods/jumpx \ | 11 | inputmethods/dvorak |
12 | inputmethods/kjumpx \ | 12 | |
13 | inputmethods/dvorak \ | 13 | APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \ |
14 | core/applets/batteryapplet \ | 14 | core/applets/irdaapplet core/applets/volumeapplet \ |
15 | core/applets/batteryapplet-ipaq \ | 15 | core/applets/clockapplet core/applets/netmonapplet \ |
16 | core/applets/irdaapplet \ | 16 | core/applets/screenshotapplet core/applets/clipboardapplet \ |
17 | core/applets/volumeapplet \ | 17 | core/applets/cardmon core/applets/obex \ |
18 | core/applets/clockapplet \ | 18 | core/applets/vmemo noncore/net/netsetup/dialup \ |
19 | core/applets/netmonapplet \ | 19 | noncore/net/netsetup/lan |
20 | core/applets/screenshotapplet \ | 20 | |
21 | core/applets/clipboardapplet \ | 21 | MAIL= noncore/mail/libmail noncore/mail/bend |
22 | core/applets/cardmon \ | 22 | |
23 | core/applets/obex \ | 23 | PLAYER = core/multimedia/opieplayer/libmpeg3 \ |
24 | core/applets/vmemo \ | ||
25 | noncore/net/netsetup/dialup \ | ||
26 | noncore/net/netsetup/lan \ | ||
27 | core/multimedia/opieplayer/libmpeg3 \ | ||
28 | core/multimedia/opieplayer/libmad \ | 24 | core/multimedia/opieplayer/libmad \ |
29 | core/multimedia/opieplayer/wavplugin \ | 25 | core/multimedia/opieplayer/wavplugin |
30 | noncore/mail/libmail \ | 26 | |
31 | noncore/mail/bend \ | 27 | COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER) |
32 | 28 | ||
33 | APPS=$(LOCALAPPS) core/pim/addressbook noncore/tools/calculator \ | 29 | |
34 | noncore/tools/clock core/pim/datebook core/apps/filebrowser \ | 30 | PIMAPPS = core/pim/addressbook core/pim/datebook \ |
35 | core/apps/helpbrowser noncore/games/minesweep \ | 31 | core/pim/today core/pim/todo |
36 | core/multimedia/opieplayer core/settings/light-and-power \ | 32 | |
37 | noncore/settings/language \ | 33 | COREAPPS = core/apps/filebrowser core/apps/helpbrowser \ |
38 | noncore/settings/rotation \ | 34 | core/apps/textedit core/apps/embeddedkonsole \ |
39 | noncore/settings/appearance \ | 35 | core/launcher core/apps/sysinfo \ |
40 | core/settings/security \ | 36 | core/apps/oipkg core/apps/qcop |
41 | noncore/settings/sound \ | 37 | |
42 | core/settings/systemtime \ | 38 | COREMULTIMEDIA = core/multimedia/opieplayer |
43 | noncore/settings/mediummount \ | 39 | |
44 | noncore/settings/tabmanager \ | 40 | CORESETTINGS = core/settings/light-and-power core/settings/security \ |
45 | noncore/games/solitaire noncore/apps/spreadsheet \ | 41 | core/settings/systemtime core/settings/citytime \ |
46 | noncore/games/tetrix core/apps/textedit \ | 42 | core/settings/wlansetup |
47 | core/pim/todo noncore/games/wordgame core/apps/embeddedkonsole \ | 43 | |
48 | core/launcher core/apps/sysinfo \ | 44 | NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \ |
49 | noncore/games/parashoot noncore/games/snake core/settings/citytime \ | 45 | noncore/settings/appearance noncore/settings/sound \ |
50 | noncore/multimedia/showimg noncore/net/netsetup core/settings/wlansetup \ | 46 | noncore/settings/mediummount \ |
51 | noncore/apps/tableviewer core/apps/oipkg noncore/games/mindbreaker \ | 47 | noncore/settings/tabmanager noncore/settings/appskey |
52 | noncore/games/go noncore/games/qasteroids core/apps/qcop \ | 48 | |
53 | noncore/games/fifteen noncore/comm/keypebble \ | 49 | NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \ |
54 | core/pim/today noncore/games/tictac noncore/net/opieftp \ | 50 | noncore/tools/remote noncore/tools/opie-sh |
55 | noncore/graphics/drawpad noncore/games/kcheckers noncore/settings/appskey \ | 51 | |
56 | noncore/graphics/qpdf noncore/games/kpacman noncore/apps/advancedfm \ | 52 | GAMES = noncore/games/minesweep noncore/games/solitaire \ |
57 | noncore/games/kbill noncore/tools/remote \ | 53 | noncore/games/tetrix noncore/games/wordgame \ |
58 | noncore/tools/opie-sh \ | 54 | noncore/games/parashoot noncore/games/snake \ |
59 | noncore/mail | 55 | noncore/games/mindbreaker \ |
56 | noncore/games/go noncore/games/qasteroids \ | ||
57 | noncore/games/fifteen noncore/games/tictac \ | ||
58 | noncore/games/kcheckers noncore/games/kpacman \ | ||
59 | noncore/games/kbill | ||
60 | |||
61 | NONAPPS = noncore/apps/spreadsheet noncore/apps/tableviewer \ | ||
62 | noncore/apps/advancedfm | ||
63 | |||
64 | NONNET = noncore/net/netsetup noncore/net/opieftp \ | ||
65 | noncore/mail | ||
66 | |||
67 | NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \ | ||
68 | noncore/graphics/qpdf | ||
69 | |||
70 | |||
71 | NONCOMM = noncore/comm/keypebble | ||
72 | |||
73 | APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \ | ||
74 | $(COREMULTIMEDIA) $(CORESETTINGS) \ | ||
75 | $(NONCORESETTINGS) $(NONCORETOOLS) \ | ||
76 | $(NOAPPS) $(NONNET) $(NONMULT) \ | ||
77 | $(NONCOMM) $(GAMES) | ||
78 | |||
79 | |||
60 | 80 | ||
61 | NONTMAKEAPPS := ipaq/opiealarm noncore/nethack | 81 | NONTMAKEAPPS := ipaq/opiealarm noncore/nethack |
62 | 82 | ||
63 | DOCS = docs/src/opie-policy | 83 | DOCS = docs/src/opie-policy |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= battery.h batterystatus.h batteryappletimpl.h | 3 | HEADERS= battery.h batterystatus.h batteryappletimpl.h |
4 | SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp | 4 | SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp |
5 | TARGET = batteryapplet | 5 | TARGET = batteryapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= clipboard.h clipboardappletimpl.h | 3 | HEADERS= clipboard.h clipboardappletimpl.h |
4 | SOURCES= clipboard.cpp clipboardappletimpl.cpp | 4 | SOURCES= clipboard.cpp clipboardappletimpl.cpp |
5 | TARGET = clipboardapplet | 5 | TARGET = clipboardapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= clock.h clockappletimpl.h | 3 | HEADERS= clock.h clockappletimpl.h |
4 | SOURCES= clock.cpp clockappletimpl.cpp | 4 | SOURCES= clock.cpp clockappletimpl.cpp |
5 | TARGET = clockapplet | 5 | TARGET = clockapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = irda.h irdaappletimpl.h | 3 | HEADERS = irda.h irdaappletimpl.h |
4 | SOURCES = irda.cpp irdaappletimpl.cpp | 4 | SOURCES = irda.cpp irdaappletimpl.cpp |
5 | TARGET = irdaapplet | 5 | TARGET = irdaapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,10 +2,10 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= obex.h obeximpl.h | 3 | HEADERS= obex.h obeximpl.h |
4 | SOURCES= obex.cc obeximpl.cc | 4 | SOURCES= obex.cc obeximpl.cc |
5 | TARGET = opieobex | 5 | TARGET = opieobex |
6 | DESTDIR = ../../plugins/obex | 6 | DESTDIR = $(OPIEDIR)/plugins/obex |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | INTERFACES = obexinc.ui obexdlg.ui | 9 | INTERFACES = obexinc.ui obexdlg.ui |
10 | LIBS += -lqpe -lopie | 10 | LIBS += -lqpe -lopie |
11 | VERSION = 0.0.1 | 11 | 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 | |||
@@ -2,9 +2,9 @@ | |||
2 | #ifndef OpieObexImpl_H | 2 | #ifndef OpieObexImpl_H |
3 | #define OpieObexImpl_H | 3 | #define OpieObexImpl_H |
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include "../obexinterface.h" | 6 | #include <obexinterface.h> |
7 | #include "obexdlg.h" | 7 | #include "obexdlg.h" |
8 | #include "obexinc.h" | 8 | #include "obexinc.h" |
9 | #include <qpe/qcopenvelope_qws.h> | 9 | #include <qpe/qcopenvelope_qws.h> |
10 | 10 | ||
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS = screenshot.h screenshotappletimpl.h | 3 | HEADERS = screenshot.h screenshotappletimpl.h |
4 | SOURCES = screenshot.cpp screenshotappletimpl.cpp | 4 | SOURCES = screenshot.cpp screenshotappletimpl.cpp |
5 | TARGET = screenshotapplet | 5 | TARGET = screenshotapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= vmemo.h vmemoimpl.h | 3 | HEADERS= vmemo.h vmemoimpl.h |
4 | SOURCES= vmemo.cpp vmemoimpl.cpp | 4 | SOURCES= vmemo.cpp vmemoimpl.cpp |
5 | TARGET = vmemoapplet | 5 | TARGET = vmemoapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR =$(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -2,9 +2,9 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= volume.h volumeappletimpl.h | 3 | HEADERS= volume.h volumeappletimpl.h |
4 | SOURCES= volume.cpp volumeappletimpl.cpp | 4 | SOURCES= volume.cpp volumeappletimpl.cpp |
5 | TARGET = volumeapplet | 5 | TARGET = volumeapplet |
6 | DESTDIR = ../../plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
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 | |||
@@ -19,9 +19,9 @@ HEADERS = background.h \ | |||
19 | wait.h \ | 19 | wait.h \ |
20 | shutdownimpl.h \ | 20 | shutdownimpl.h \ |
21 | launcher.h \ | 21 | launcher.h \ |
22 | launcherview.h \ | 22 | launcherview.h \ |
23 | ../calibrate/calibrate.h \ | 23 | $(OPIEDIR)/core/apps/calibrate/calibrate.h \ |
24 | startmenu.h \ | 24 | startmenu.h \ |
25 | transferserver.h \ | 25 | transferserver.h \ |
26 | qcopbridge.h \ | 26 | qcopbridge.h \ |
27 | packageslave.h \ | 27 | packageslave.h \ |
@@ -61,9 +61,9 @@ SOURCES = background.cpp \ | |||
61 | wait.cpp \ | 61 | wait.cpp \ |
62 | shutdownimpl.cpp \ | 62 | shutdownimpl.cpp \ |
63 | launcher.cpp \ | 63 | launcher.cpp \ |
64 | launcherview.cpp \ | 64 | launcherview.cpp \ |
65 | $(OPIEDIR)/calibrate/calibrate.cpp \ | 65 | $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ |
66 | transferserver.cpp \ | 66 | transferserver.cpp \ |
67 | packageslave.cpp \ | 67 | packageslave.cpp \ |
68 | irserver.cpp \ | 68 | irserver.cpp \ |
69 | qcopbridge.cpp \ | 69 | qcopbridge.cpp \ |
@@ -100,10 +100,10 @@ INTERFACES = shutdown.ui syncdialog.ui | |||
100 | 100 | ||
101 | INCLUDEPATH += $(OPIEDIR)/include | 101 | INCLUDEPATH += $(OPIEDIR)/include |
102 | DEPENDPATH+= $(OPIEDIR)/include . | 102 | DEPENDPATH+= $(OPIEDIR)/include . |
103 | 103 | ||
104 | INCLUDEPATH += $(OPIEDIR)/calibrate | 104 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate |
105 | DEPENDPATH+= $(OPIEDIR)/calibrate | 105 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate |
106 | 106 | ||
107 | INCLUDEPATH += $(OPIEDIR)/rsync | 107 | INCLUDEPATH += $(OPIEDIR)/rsync |
108 | DEPENDPATH+= $(OPIEDIR)/rsync | 108 | DEPENDPATH+= $(OPIEDIR)/rsync |
109 | 109 | ||
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,7 +1,7 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = settings.h | 4 | HEADERS = settings.h |
5 | SOURCES = light.cpp main.cpp | 5 | SOURCES = light.cpp main.cpp |
6 | INTERFACES= lightsettingsbase.ui | 6 | INTERFACES= lightsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
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,7 +1,7 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = security.h | 4 | HEADERS = security.h |
5 | SOURCES = security.cpp main.cpp | 5 | SOURCES = security.cpp main.cpp |
6 | INTERFACES= securitybase.ui | 6 | INTERFACES= securitybase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index 16888bb..f3a76d4 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro | |||
@@ -1,7 +1,7 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = settings.h | 4 | HEADERS = settings.h |
5 | SOURCES = language.cpp main.cpp | 5 | SOURCES = language.cpp main.cpp |
6 | INTERFACES= languagesettingsbase.ui | 6 | INTERFACES= languagesettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro index 0ed5744..d6983ec 100644 --- a/noncore/settings/mediummount/mediummount.pro +++ b/noncore/settings/mediummount/mediummount.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | DESTDIR = ../../bin/ | 2 | DESTDIR = $(OPIEDIR)/bin/ |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release |
5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h | 5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h |
6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc | 6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc |
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index ff5cd09..28c8b0d 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -1,7 +1,7 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = ../../bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = soundsettings.h soundsettingsbase.h | 4 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 6 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |