summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-27 12:24:03 (UTC)
committer zecke <zecke>2003-08-27 12:24:03 (UTC)
commit6a6af694205eb9a55b18eb10f2290a9747019388 (patch) (side-by-side diff)
treee930a44ea8b32720a9611bbfd59a71b83bb7e606
parent151c319a9a67ae420136fb23cc987d23059737f6 (diff)
downloadopie-6a6af694205eb9a55b18eb10f2290a9747019388.zip
opie-6a6af694205eb9a55b18eb10f2290a9747019388.tar.gz
opie-6a6af694205eb9a55b18eb10f2290a9747019388.tar.bz2
If you add quick-app to the CONFIG options
it'll use the global quick app setting to either be a lib or normal executable
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make11
-rw-r--r--config.in4
-rw-r--r--include.pro18
3 files changed, 32 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index 5fd8d90..d4ccf44 100644
--- a/Rules.make
+++ b/Rules.make
@@ -20,2 +20,13 @@ else
endif
+ifneq ($(CONFIG_QUICK_LAUNCH),)
+ echo contains\( CONFIG, quick-app \) \{ >> $@
+ echo CONFIG -= quick-app >> $@
+ echo CONFIG += quick-app-lib >> $@
+ echo \} >> $@
+else
+ echo contains\( CONFIG, quick-app \) \{ >> $@
+ echo CONFIG -= quick-app >> $@
+ echo CONFIG += quick-app-bin >> $@
+ echo \} >> $@
+endif
diff --git a/config.in b/config.in
index aa6a0d4..c6ee7a6 100644
--- a/config.in
+++ b/config.in
@@ -40,2 +40,6 @@ config RELEASE
+config QUICK_LAUNCH
+ boolean "Enable Quick Launch"
+ default n
+
config SPECFILE
diff --git a/include.pro b/include.pro
index 3ba8776..c70c4d5 100644
--- a/include.pro
+++ b/include.pro
@@ -1 +1,3 @@
+include ( $(OPIEDIR)/gen.pro )
+
# make install
@@ -5,2 +7,15 @@ prefix = /opt/QtPalmtop
+
+contains( CONFIG, quick-app-lib ) {
+ TEMPLATE = lib
+ DESTDIR = $(OPIEDIR)/plugins/applications
+ DEFINES += OPIE_APP_INTERFACE
+}
+contains ( CONFIG, quick-app-bin ) {
+ TEMPLATE = app
+ DESTDIR = $(OPIEDIR)/bin
+ DEFINES -= OPIE_APP_INTERFACE
+}
+
+
contains( TEMPLATE, lib ) {
@@ -79,2 +94,3 @@ OBJECTS_DIR=.obj/$(PLATFORM)
-include ( $(OPIEDIR)/gen.pro )
+#was here now at thetop
+#include ( $(OPIEDIR)/gen.pro )