summaryrefslogtreecommitdiff
Unidiff
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
@@ -18,6 +18,17 @@ ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
18else 18else
19 echo CONFIG += qt3 >> $@ 19 echo CONFIG += qt3 >> $@
20endif 20endif
21ifneq ($(CONFIG_QUICK_LAUNCH),)
22 echo contains\( CONFIG, quick-app \) \{ >> $@
23 echo CONFIG -= quick-app >> $@
24 echo CONFIG += quick-app-lib >> $@
25 echo \} >> $@
26else
27 echo contains\( CONFIG, quick-app \) \{ >> $@
28 echo CONFIG -= quick-app >> $@
29 echo CONFIG += quick-app-bin >> $@
30 echo \} >> $@
31 endif
21 32
22$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 33$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
23 @echo Generating dependency information... 34 @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
38 default y 38 default y
39 depends !DEBUG 39 depends !DEBUG
40 40
41config QUICK_LAUNCH
42 boolean "Enable Quick Launch"
43 default n
44
41config SPECFILE 45config SPECFILE
42 string 46 string
43 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 47 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 @@
1include ( $(OPIEDIR)/gen.pro )
2
1# make install 3# make install
2 4
3# base opie install path 5# base opie install path
4prefix = /opt/QtPalmtop 6prefix = /opt/QtPalmtop
5 7
8
9contains( CONFIG, quick-app-lib ) {
10 TEMPLATE = lib
11 DESTDIR = $(OPIEDIR)/plugins/applications
12 DEFINES += OPIE_APP_INTERFACE
13}
14contains ( CONFIG, quick-app-bin ) {
15 TEMPLATE = app
16 DESTDIR = $(OPIEDIR)/bin
17 DEFINES -= OPIE_APP_INTERFACE
18}
19
20
6contains( TEMPLATE, lib ) { 21contains( TEMPLATE, lib ) {
7 target.path = $$prefix/lib 22 target.path = $$prefix/lib
8} 23}
@@ -77,4 +92,5 @@ QMAKE_LIBDIR += $(OPIEDIR)/lib
77MOC_DIR=.moc/$(PLATFORM) 92MOC_DIR=.moc/$(PLATFORM)
78OBJECTS_DIR=.obj/$(PLATFORM) 93OBJECTS_DIR=.obj/$(PLATFORM)
79 94
80include ( $(OPIEDIR)/gen.pro ) 95#was here now at thetop
96#include ( $(OPIEDIR)/gen.pro )