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

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
@@ -18,6 +18,17 @@ ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
 else
 	echo CONFIG += qt3 >> $@
 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	
 
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
 	@echo Generating dependency information...
diff --git a/config.in b/config.in
index aa6a0d4..c6ee7a6 100644
--- a/config.in
+++ b/config.in
@@ -38,6 +38,10 @@ config RELEASE
   default y
   depends !DEBUG
 
+config QUICK_LAUNCH
+  boolean "Enable Quick Launch"
+  default n
+
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
diff --git a/include.pro b/include.pro
index 3ba8776..c70c4d5 100644
--- a/include.pro
+++ b/include.pro
@@ -1,8 +1,23 @@
+include ( $(OPIEDIR)/gen.pro )
+
 # make install
 
 # base opie install path
 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 ) {
   target.path = $$prefix/lib
 }
@@ -77,4 +92,5 @@ QMAKE_LIBDIR += $(OPIEDIR)/lib
 MOC_DIR=.moc/$(PLATFORM)
 OBJECTS_DIR=.obj/$(PLATFORM)
 
-include ( $(OPIEDIR)/gen.pro )
+#was here now at thetop
+#include ( $(OPIEDIR)/gen.pro )