summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-21 11:50:39 (UTC)
committer mickeyl <mickeyl>2003-09-21 11:50:39 (UTC)
commitbef84fa57fcb1ea5815ea55be7ac12b1a9df0c24 (patch) (unidiff)
tree9e1458ac3d4e7eb68068ae322b96f6e82470ab67
parent2fbd2230957098e5601d9d5c4b04a4af220afbce (diff)
downloadopie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.zip
opie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.tar.gz
opie-bef84fa57fcb1ea5815ea55be7ac12b1a9df0c24.tar.bz2
fix app building in non-quicklaunch-mode
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro5
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 @@
1include ( $(OPIEDIR)/gen.pro ) 1include ( $(OPIEDIR)/gen.pro )
2 2
3# base opie install path 3# base opie install path
4prefix = /opt/QtPalmtop 4prefix = /opt/QtPalmtop
5 5
6contains( CONFIG, quick-app-lib ) { 6contains( 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
17contains ( CONFIG, quick-app-bin ) { 17contains ( 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
25contains( TEMPLATE, lib ) { 26contains( 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}
31INSTALLS += target 32INSTALLS += target
32 33
33# ipkg control files 34# ipkg control files
34control.path = /CONTROL 35control.path = /CONTROL
35control.files = control postinst prerm postrm preinst conffiles 36control.files = control postinst prerm postrm preinst conffiles
36INSTALLS += control 37INSTALLS += control
37 38
38# images, default is $$prefix/pics/$$TARGET 39# images, default is $$prefix/pics/$$TARGET
39pics.path = $$prefix/pics/$$TARGET 40pics.path = $$prefix/pics/$$TARGET
40pics.files = pics/* 41pics.files = pics/*
41INSTALLS += pics 42INSTALLS += pics
42 43
43# sounds, default path is $$prefix/sounds/$$TARGET 44# sounds, default path is $$prefix/sounds/$$TARGET
44sounds.path = $$prefix/sounds/$$TARGET 45sounds.path = $$prefix/sounds/$$TARGET
45sounds.files = sounds/* 46sounds.files = sounds/*
46INSTALLS += sounds 47INSTALLS += sounds
47 48
48# init scripts, default path is /etc/init.d 49# init scripts, default path is /etc/init.d
49init.path = /etc/init.d 50init.path = /etc/init.d
50init.files = init.d/* 51init.files = init.d/*
51INSTALLS += init 52INSTALLS += init
52 53
53# data, default path is /usr/share/$$TARGET 54# data, default path is /usr/share/$$TARGET
54data.path = /usr/share/$$TARGET 55data.path = /usr/share/$$TARGET
55data.files = share/* 56data.files = share/*
56INSTALLS += data 57INSTALLS += data
57 58
58etc.path = $$prefix/etc/ 59etc.path = $$prefix/etc/
59etc.files = etc/* 60etc.files = etc/*
60INSTALLS += etc 61INSTALLS += etc
61 62
62apps.path = $$prefix/apps/ 63apps.path = $$prefix/apps/
63apps.files = apps/* 64apps.files = apps/*
64INSTALLS += apps 65INSTALLS += apps
65 66
66# sounds, default path is $$prefix/sounds/$$TARGET 67# sounds, default path is $$prefix/sounds/$$TARGET
67sounds.path = $$prefix/sounds/$$TARGET 68sounds.path = $$prefix/sounds/$$TARGET
68sounds.files = sounds/* 69sounds.files = sounds/*
69INSTALLS += sounds 70INSTALLS += sounds
70 71
71# anything in nonstandard paths 72# anything in nonstandard paths
72root.path = / 73root.path = /
73root.files = root/* 74root.files = root/*
74INSTALLS += root 75INSTALLS += root
75 76
76# new targets 77# new targets
77opie-lupdate.target = opie-lupdate 78opie-lupdate.target = opie-lupdate
78opie-lupdate.commands = opie-lupdate $(PRO) 79opie-lupdate.commands = opie-lupdate $(PRO)
79 80
80opie-lrelease.target = opie-lrelease 81opie-lrelease.target = opie-lrelease
81opie-lrelease.commands = opie-lrelease $(PRO) 82opie-lrelease.commands = opie-lrelease $(PRO)
82 83
83lupdate.target = lupdate 84lupdate.target = lupdate
84lupdate.commands = lupdate -noobsolete $(PRO) 85lupdate.commands = lupdate -noobsolete $(PRO)
85 86
86lrelease.target = lrelease 87lrelease.target = lrelease
87lrelease.commands = lrelease $(PRO) 88lrelease.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
90messages.target = messages 91messages.target = messages
91messages.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' 92messages.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
93ipk.target = ipk 94ipk.target = ipk
94ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 95ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
95 96
96QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages 97QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
97QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 98QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
98QMAKE_LIBDIR += $(OPIEDIR)/lib 99QMAKE_LIBDIR += $(OPIEDIR)/lib
99 100
100MOC_DIR=.moc/$(PLATFORM) 101MOC_DIR=.moc/$(PLATFORM)
101OBJECTS_DIR=.obj/$(PLATFORM) 102OBJECTS_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 )