summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -9,24 +9,35 @@ $(TOPDIR)/gen.pro : $(TOPDIR)/.config
9ifneq ($(CONFIG_DEBUG),) 9ifneq ($(CONFIG_DEBUG),)
10 echo CONFIG += debug >> $@ 10 echo CONFIG += debug >> $@
11 echo CONFIG -= release >> $@ 11 echo CONFIG -= release >> $@
12else 12else
13 echo CONFIG -= debug >> $@ 13 echo CONFIG -= debug >> $@
14 echo CONFIG += release >> $@ 14 echo CONFIG += release >> $@
15endif 15endif
16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 16ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
17 echo CONFIG -= qt3 >> $@ 17 echo CONFIG -= 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...
24# add to subdir-y, and add descend rules 35# add to subdir-y, and add descend rules
25 @cat $(TOPDIR)/packages | grep -v '^#' | \ 36 @cat $(TOPDIR)/packages | grep -v '^#' | \
26 awk '{print \ 37 awk '{print \
27 ".PHONY : " $$2 "\n" \ 38 ".PHONY : " $$2 "\n" \
28 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 39 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
29 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 40 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
30 cat $(TOPDIR)/packages | grep -v '^#' | \ 41 cat $(TOPDIR)/packages | grep -v '^#' | \
31 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 42 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
32 >> $(TOPDIR)/.depends 43 >> $(TOPDIR)/.depends
diff --git a/config.in b/config.in
index aa6a0d4..c6ee7a6 100644
--- a/config.in
+++ b/config.in
@@ -28,24 +28,28 @@ endchoice
28 28
29config OPTIMIZE 29config OPTIMIZE
30 boolean "Use optimizations" 30 boolean "Use optimizations"
31 default "y" if ! TARGET_X86 31 default "y" if ! TARGET_X86
32 32
33config DEBUG 33config DEBUG
34 boolean "Enable debug builds" 34 boolean "Enable debug builds"
35 default n 35 default n
36config RELEASE 36config RELEASE
37 bool 37 bool
38 default y 38 default y
39 depends !DEBUG 39 depends !DEBUG
40
41config QUICK_LAUNCH
42 boolean "Enable Quick Launch"
43 default n
40 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)
44 default "linux-g++" if TARGET_X86 && X11 48 default "linux-g++" if TARGET_X86 && X11
45 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 49 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
46 default "linux-g++" if TARGET_SHARP && X11 50 default "linux-g++" if TARGET_SHARP && X11
47 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) 51 default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
48 default "linux-g++" if TARGET_IPAQ && X11 52 default "linux-g++" if TARGET_IPAQ && X11
49 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11) 53 default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
50 default "linux-g++" if TARGET_RAMSES && X11 54 default "linux-g++" if TARGET_RAMSES && X11
51 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11) 55 default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)
diff --git a/include.pro b/include.pro
index 3ba8776..c70c4d5 100644
--- a/include.pro
+++ b/include.pro
@@ -1,17 +1,32 @@
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}
9!contains( TEMPLATE, lib ) { 24!contains( TEMPLATE, lib ) {
10 target.path = $$prefix/bin 25 target.path = $$prefix/bin
11} 26}
12INSTALLS += target 27INSTALLS += target
13 28
14# ipkg control files 29# ipkg control files
15control.path = /CONTROL 30control.path = /CONTROL
16control.files = control postinst prerm postrm preinst conffiles 31control.files = control postinst prerm postrm preinst conffiles
17INSTALLS += control 32INSTALLS += control
@@ -68,13 +83,14 @@ lrelease.target = lrelease
68lrelease.commands = lrelease $(PRO) 83lrelease.commands = lrelease $(PRO)
69 84
70ipk.target = ipk 85ipk.target = ipk
71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 86ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
72 87
73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease 88QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 89QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
75QMAKE_LIBDIR += $(OPIEDIR)/lib 90QMAKE_LIBDIR += $(OPIEDIR)/lib
76 91
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 )