-rw-r--r-- | Rules.make | 12 | ||||
-rw-r--r-- | config.in | 4 | ||||
-rw-r--r-- | include.pro | 2 |
3 files changed, 17 insertions, 1 deletions
@@ -3,6 +3,16 @@ | |||
3 | $(configs) : | 3 | $(configs) : |
4 | $(call makecfg,$@) | 4 | $(call makecfg,$@) |
5 | 5 | ||
6 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | ||
7 | echo > $@ | ||
8 | ifneq ($(CONFIG_DEBUG),) | ||
9 | echo CONFIG += debug >> $@ | ||
10 | echo CONFIG -= release >> $@ | ||
11 | else | ||
12 | echo CONFIG -= debug >> $@ | ||
13 | echo CONFIG += release >> $@ | ||
14 | endif | ||
15 | |||
6 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 16 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
7 | @echo Generating dependency information... | 17 | @echo Generating dependency information... |
8 | # add to subdir-y, and add descend rules | 18 | # add to subdir-y, and add descend rules |
@@ -12,7 +22,7 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) | |||
12 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 22 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
13 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 23 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
14 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 24 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
15 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE)\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ | 25 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ |
16 | >> $(TOPDIR)/.depends | 26 | >> $(TOPDIR)/.depends |
17 | # interpackage dependency generation | 27 | # interpackage dependency generation |
18 | @cat $(TOPDIR)/packages | \ | 28 | @cat $(TOPDIR)/packages | \ |
@@ -38,6 +38,10 @@ config OPTIMIZE | |||
38 | boolean "Use optimizations" | 38 | boolean "Use optimizations" |
39 | default "y" if ! TARGET_X86 | 39 | default "y" if ! TARGET_X86 |
40 | 40 | ||
41 | config DEBUG | ||
42 | boolean "Enable debug builds" | ||
43 | default "n" | ||
44 | |||
41 | config SPECFILE | 45 | config 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 da2da04..4f1144f 100644 --- a/include.pro +++ b/include.pro | |||
@@ -68,3 +68,5 @@ ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_RO | |||
68 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk | 68 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk |
69 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 69 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
70 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 70 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
71 | |||
72 | include ( $(OPIEDIR)/gen.pro ) | ||