summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-20 13:44:33 (UTC)
committer mickeyl <mickeyl>2003-09-20 13:44:33 (UTC)
commitbb4b0d9eed924ef200787096e48c73aa7616018d (patch) (unidiff)
tree7f5834f104130c21ec1a3e409a0b193491ea39bd
parentacc378572323b79993eb535a9d596ad1fbc8ff9f (diff)
downloadopie-bb4b0d9eed924ef200787096e48c73aa7616018d.zip
opie-bb4b0d9eed924ef200787096e48c73aa7616018d.tar.gz
opie-bb4b0d9eed924ef200787096e48c73aa7616018d.tar.bz2
merge with BRANCH
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro20
1 files changed, 14 insertions, 6 deletions
diff --git a/include.pro b/include.pro
index 69fd894..43efea5 100644
--- a/include.pro
+++ b/include.pro
@@ -1,23 +1,27 @@
1include ( $(OPIEDIR)/gen.pro ) 1include ( $(OPIEDIR)/gen.pro )
2 2
3# make install
4
5# base opie install path 3# base opie install path
6prefix = /opt/QtPalmtop 4prefix = /opt/QtPalmtop
7 5
8
9contains( CONFIG, quick-app-lib ) { 6contains( CONFIG, quick-app-lib ) {
10 TEMPLATE = lib 7 TEMPLATE = lib
11 DESTDIR = $(OPIEDIR)/plugins/application 8 DESTDIR = $(OPIEDIR)/plugins/application
12 DEFINES += OPIE_APP_INTERFACE 9 DEFINES += OPIE_APP_INTERFACE
10 !contains( TARGET, launcher ) {
11 message( Linking $$TARGET to quicklauncher )
12 system( rm -f $$(OPIEDIR)/bin/$$TARGET )
13 system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET )
14 }
13} 15}
16
14contains ( CONFIG, quick-app-bin ) { 17contains ( CONFIG, quick-app-bin ) {
15 TEMPLATE = app 18 TEMPLATE = app
16 DESTDIR = $(OPIEDIR)/bin 19 DESTDIR = $(OPIEDIR)/bin
17 DEFINES -= OPIE_APP_INTERFACE 20 DEFINES -= OPIE_APP_INTERFACE
21 message( Touching plugins/application/lib$$TARGET.so )
22 system( touch $$(OPIEDIR)/plugins/application/lib$$TARGET.so )
18} 23}
19 24
20
21contains( TEMPLATE, lib ) { 25contains( TEMPLATE, lib ) {
22 target.path = $$prefix/lib 26 target.path = $$prefix/lib
23} 27}
@@ -71,7 +75,7 @@ INSTALLS += root
71 75
72# new targets 76# new targets
73opie-lupdate.target = opie-lupdate 77opie-lupdate.target = opie-lupdate
74opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) 78opie-lupdate.commands = opie-lupdate $(PRO)
75 79
76opie-lrelease.target = opie-lrelease 80opie-lrelease.target = opie-lrelease
77opie-lrelease.commands = opie-lrelease $(PRO) 81opie-lrelease.commands = opie-lrelease $(PRO)
@@ -82,10 +86,14 @@ lupdate.commands = lupdate -noobsolete $(PRO)
82lrelease.target = lrelease 86lrelease.target = lrelease
83lrelease.commands = lrelease $(PRO) 87lrelease.commands = lrelease $(PRO)
84 88
89# new message target to get all strings from the apps with and without tr
90messages.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'
92
85ipk.target = ipk 93ipk.target = ipk
86ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 94ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
87 95
88QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease 96QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
89QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 97QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
90QMAKE_LIBDIR += $(OPIEDIR)/lib 98QMAKE_LIBDIR += $(OPIEDIR)/lib
91 99