From bb4b0d9eed924ef200787096e48c73aa7616018d Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sat, 20 Sep 2003 13:44:33 +0000 Subject: merge with BRANCH --- diff --git a/include.pro b/include.pro index 69fd894..43efea5 100644 --- a/include.pro +++ b/include.pro @@ -1,23 +1,27 @@ include ( $(OPIEDIR)/gen.pro ) -# make install - # base opie install path prefix = /opt/QtPalmtop - contains( CONFIG, quick-app-lib ) { TEMPLATE = lib DESTDIR = $(OPIEDIR)/plugins/application 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 ) { TEMPLATE = app DESTDIR = $(OPIEDIR)/bin DEFINES -= OPIE_APP_INTERFACE + message( Touching plugins/application/lib$$TARGET.so ) + system( touch $$(OPIEDIR)/plugins/application/lib$$TARGET.so ) } - contains( TEMPLATE, lib ) { target.path = $$prefix/lib } @@ -71,7 +75,7 @@ INSTALLS += root # new targets opie-lupdate.target = opie-lupdate -opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) +opie-lupdate.commands = opie-lupdate $(PRO) opie-lrelease.target = opie-lrelease opie-lrelease.commands = opie-lrelease $(PRO) @@ -82,10 +86,14 @@ lupdate.commands = lupdate -noobsolete $(PRO) lrelease.target = lrelease 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 ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) -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 QMAKE_LIBDIR += $(OPIEDIR)/lib -- cgit v0.9.0.2