author | mickeyl <mickeyl> | 2003-09-21 11:50:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-09-21 11:50:39 (UTC) |
commit | bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24 (patch) (unidiff) | |
tree | 9e1458ac3d4e7eb68068ae322b96f6e82470ab67 | |
parent | 2fbd2230957098e5601d9d5c4b04a4af220afbce (diff) | |
download | opie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.zip opie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.tar.gz opie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.tar.bz2 |
fix app building in non-quicklaunch-mode
-rw-r--r-- | include.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include.pro b/include.pro index 43efea5..70ed731 100644 --- a/include.pro +++ b/include.pro | |||
@@ -1,104 +1,105 @@ | |||
1 | include ( $(OPIEDIR)/gen.pro ) | 1 | include ( $(OPIEDIR)/gen.pro ) |
2 | 2 | ||
3 | # base opie install path | 3 | # base opie install path |
4 | prefix = /opt/QtPalmtop | 4 | prefix = /opt/QtPalmtop |
5 | 5 | ||
6 | contains( CONFIG, quick-app-lib ) { | 6 | contains( CONFIG, quick-app-lib ) { |
7 | TEMPLATE = lib | 7 | TEMPLATE = lib |
8 | DESTDIR = $(OPIEDIR)/plugins/application | 8 | DESTDIR = $(OPIEDIR)/plugins/application |
9 | DEFINES += OPIE_APP_INTERFACE | 9 | DEFINES += OPIE_APP_INTERFACE |
10 | !contains( TARGET, launcher ) { | 10 | !contains( TARGET, launcher ) { |
11 | message( Linking $$TARGET to quicklauncher ) | 11 | message( Linking $$TARGET to quicklauncher ) |
12 | system( rm -f $$(OPIEDIR)/bin/$$TARGET ) | 12 | system( rm -f $$(OPIEDIR)/bin/$$TARGET ) |
13 | system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET ) | 13 | system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET ) |
14 | } | 14 | } |
15 | } | 15 | } |
16 | 16 | ||
17 | contains ( CONFIG, quick-app-bin ) { | 17 | contains ( CONFIG, quick-app-bin ) { |
18 | TEMPLATE = app | 18 | TEMPLATE = app |
19 | DESTDIR = $(OPIEDIR)/bin | 19 | DESTDIR = $(OPIEDIR)/bin |
20 | DEFINES -= OPIE_APP_INTERFACE | 20 | DEFINES -= OPIE_APP_INTERFACE |
21 | message( Touching plugins/application/lib$$TARGET.so ) | 21 | message( Touching plugins/application/lib$${TARGET}.so ) |
22 | system( touch $$(OPIEDIR)/plugins/application/lib$$TARGET.so ) | 22 | system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so ) |
23 | } | 23 | } |
24 | 24 | ||
25 | |||
25 | contains( TEMPLATE, lib ) { | 26 | contains( TEMPLATE, lib ) { |
26 | target.path = $$prefix/lib | 27 | target.path = $$prefix/lib |
27 | } | 28 | } |
28 | !contains( TEMPLATE, lib ) { | 29 | !contains( TEMPLATE, lib ) { |
29 | target.path = $$prefix/bin | 30 | target.path = $$prefix/bin |
30 | } | 31 | } |
31 | INSTALLS += target | 32 | INSTALLS += target |
32 | 33 | ||
33 | # ipkg control files | 34 | # ipkg control files |
34 | control.path = /CONTROL | 35 | control.path = /CONTROL |
35 | control.files = control postinst prerm postrm preinst conffiles | 36 | control.files = control postinst prerm postrm preinst conffiles |
36 | INSTALLS += control | 37 | INSTALLS += control |
37 | 38 | ||
38 | # images, default is $$prefix/pics/$$TARGET | 39 | # images, default is $$prefix/pics/$$TARGET |
39 | pics.path = $$prefix/pics/$$TARGET | 40 | pics.path = $$prefix/pics/$$TARGET |
40 | pics.files = pics/* | 41 | pics.files = pics/* |
41 | INSTALLS += pics | 42 | INSTALLS += pics |
42 | 43 | ||
43 | # sounds, default path is $$prefix/sounds/$$TARGET | 44 | # sounds, default path is $$prefix/sounds/$$TARGET |
44 | sounds.path = $$prefix/sounds/$$TARGET | 45 | sounds.path = $$prefix/sounds/$$TARGET |
45 | sounds.files = sounds/* | 46 | sounds.files = sounds/* |
46 | INSTALLS += sounds | 47 | INSTALLS += sounds |
47 | 48 | ||
48 | # init scripts, default path is /etc/init.d | 49 | # init scripts, default path is /etc/init.d |
49 | init.path = /etc/init.d | 50 | init.path = /etc/init.d |
50 | init.files = init.d/* | 51 | init.files = init.d/* |
51 | INSTALLS += init | 52 | INSTALLS += init |
52 | 53 | ||
53 | # data, default path is /usr/share/$$TARGET | 54 | # data, default path is /usr/share/$$TARGET |
54 | data.path = /usr/share/$$TARGET | 55 | data.path = /usr/share/$$TARGET |
55 | data.files = share/* | 56 | data.files = share/* |
56 | INSTALLS += data | 57 | INSTALLS += data |
57 | 58 | ||
58 | etc.path = $$prefix/etc/ | 59 | etc.path = $$prefix/etc/ |
59 | etc.files = etc/* | 60 | etc.files = etc/* |
60 | INSTALLS += etc | 61 | INSTALLS += etc |
61 | 62 | ||
62 | apps.path = $$prefix/apps/ | 63 | apps.path = $$prefix/apps/ |
63 | apps.files = apps/* | 64 | apps.files = apps/* |
64 | INSTALLS += apps | 65 | INSTALLS += apps |
65 | 66 | ||
66 | # sounds, default path is $$prefix/sounds/$$TARGET | 67 | # sounds, default path is $$prefix/sounds/$$TARGET |
67 | sounds.path = $$prefix/sounds/$$TARGET | 68 | sounds.path = $$prefix/sounds/$$TARGET |
68 | sounds.files = sounds/* | 69 | sounds.files = sounds/* |
69 | INSTALLS += sounds | 70 | INSTALLS += sounds |
70 | 71 | ||
71 | # anything in nonstandard paths | 72 | # anything in nonstandard paths |
72 | root.path = / | 73 | root.path = / |
73 | root.files = root/* | 74 | root.files = root/* |
74 | INSTALLS += root | 75 | INSTALLS += root |
75 | 76 | ||
76 | # new targets | 77 | # new targets |
77 | opie-lupdate.target = opie-lupdate | 78 | opie-lupdate.target = opie-lupdate |
78 | opie-lupdate.commands = opie-lupdate $(PRO) | 79 | opie-lupdate.commands = opie-lupdate $(PRO) |
79 | 80 | ||
80 | opie-lrelease.target = opie-lrelease | 81 | opie-lrelease.target = opie-lrelease |
81 | opie-lrelease.commands = opie-lrelease $(PRO) | 82 | opie-lrelease.commands = opie-lrelease $(PRO) |
82 | 83 | ||
83 | lupdate.target = lupdate | 84 | lupdate.target = lupdate |
84 | lupdate.commands = lupdate -noobsolete $(PRO) | 85 | lupdate.commands = lupdate -noobsolete $(PRO) |
85 | 86 | ||
86 | lrelease.target = lrelease | 87 | lrelease.target = lrelease |
87 | lrelease.commands = lrelease $(PRO) | 88 | lrelease.commands = lrelease $(PRO) |
88 | 89 | ||
89 | # new message target to get all strings from the apps with and without tr | 90 | # new message target to get all strings from the apps with and without tr |
90 | messages.target = messages | 91 | messages.target = messages |
91 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' | 92 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' |
92 | 93 | ||
93 | ipk.target = ipk | 94 | ipk.target = ipk |
94 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 95 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
95 | 96 | ||
96 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages | 97 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages |
97 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 98 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
98 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 99 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
99 | 100 | ||
100 | MOC_DIR=.moc/$(PLATFORM) | 101 | MOC_DIR=.moc/$(PLATFORM) |
101 | OBJECTS_DIR=.obj/$(PLATFORM) | 102 | OBJECTS_DIR=.obj/$(PLATFORM) |
102 | 103 | ||
103 | #was here now at thetop | 104 | #was here now at thetop |
104 | #include ( $(OPIEDIR)/gen.pro ) | 105 | #include ( $(OPIEDIR)/gen.pro ) |