summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-09-20 13:44:33 (UTC)
committer mickeyl <mickeyl>2003-09-20 13:44:33 (UTC)
commitbb4b0d9eed924ef200787096e48c73aa7616018d (patch) (side-by-side diff)
tree7f5834f104130c21ec1a3e409a0b193491ea39bd
parentacc378572323b79993eb535a9d596ad1fbc8ff9f (diff)
downloadopie-bb4b0d9eed924ef200787096e48c73aa7616018d.zip
opie-bb4b0d9eed924ef200787096e48c73aa7616018d.tar.gz
opie-bb4b0d9eed924ef200787096e48c73aa7616018d.tar.bz2
merge with BRANCH
Diffstat (more/less context) (show 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
@@ -2,4 +2,2 @@ include ( $(OPIEDIR)/gen.pro )
-# make install
-
# base opie install path
@@ -7,3 +5,2 @@ prefix = /opt/QtPalmtop
-
contains( CONFIG, quick-app-lib ) {
@@ -12,3 +9,9 @@ contains( CONFIG, quick-app-lib ) {
DEFINES += OPIE_APP_INTERFACE
+ !contains( TARGET, launcher ) {
+ message( Linking $$TARGET to quicklauncher )
+ system( rm -f $$(OPIEDIR)/bin/$$TARGET )
+ system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET )
+ }
}
+
contains ( CONFIG, quick-app-bin ) {
@@ -17,5 +20,6 @@ contains ( CONFIG, quick-app-bin ) {
DEFINES -= OPIE_APP_INTERFACE
+ message( Touching plugins/application/lib$$TARGET.so )
+ system( touch $$(OPIEDIR)/plugins/application/lib$$TARGET.so )
}
-
contains( TEMPLATE, lib ) {
@@ -73,3 +77,3 @@ INSTALLS += root
opie-lupdate.target = opie-lupdate
-opie-lupdate.commands = opie-lupdate -noobsolete $(PRO)
+opie-lupdate.commands = opie-lupdate $(PRO)
@@ -84,2 +88,6 @@ lrelease.commands = lrelease $(PRO)
+# new message target to get all strings from the apps with and without tr
+messages.target = messages
+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'
+
ipk.target = ipk
@@ -87,3 +95,3 @@ ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_RO
-QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
+QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib