summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-23 18:06:17 (UTC)
committer kergoth <kergoth>2003-04-23 18:06:17 (UTC)
commit3d0eacfe335f073b2ece67d762e8d182a6329303 (patch) (unidiff)
tree5a901fd12300a5d153f3aacd5d5435027e385ea4
parent7272fdfd7490b789d978f8d9822bdd899c660eb5 (diff)
downloadopie-3d0eacfe335f073b2ece67d762e8d182a6329303.zip
opie-3d0eacfe335f073b2ece67d762e8d182a6329303.tar.gz
opie-3d0eacfe335f073b2ece67d762e8d182a6329303.tar.bz2
Add qt3 to CONFIG if the qte version read from qtdir/include/qglobal.h is 3.x
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make5
1 files changed, 5 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 85d7d87..9078d5e 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,38 +1,43 @@
1.PHONY: FORCE 1.PHONY: FORCE
2 2
3$(configs) : 3$(configs) :
4 $(call makecfg,$@) 4 $(call makecfg,$@)
5 5
6$(TOPDIR)/gen.pro : $(TOPDIR)/.config 6$(TOPDIR)/gen.pro : $(TOPDIR)/.config
7 echo > $@ 7 echo > $@
8ifneq ($(CONFIG_DEBUG),) 8ifneq ($(CONFIG_DEBUG),)
9 echo CONFIG += debug >> $@ 9 echo CONFIG += debug >> $@
10 echo CONFIG -= release >> $@ 10 echo CONFIG -= release >> $@
11else 11else
12 echo CONFIG -= debug >> $@ 12 echo CONFIG -= debug >> $@
13 echo CONFIG += release >> $@ 13 echo CONFIG += release >> $@
14endif 14endif
15ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
16 echo CONFIG -= qt3 >> $@
17else
18 echo CONFIG += qt3 >> $@
19endif
15 20
16$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 21$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
17 @echo Generating dependency information... 22 @echo Generating dependency information...
18# add to subdir-y, and add descend rules 23# add to subdir-y, and add descend rules
19 @cat $(TOPDIR)/packages | grep -v '^#' | \ 24 @cat $(TOPDIR)/packages | grep -v '^#' | \
20 awk '{print \ 25 awk '{print \
21 ".PHONY : " $$2 "\n" \ 26 ".PHONY : " $$2 "\n" \
22 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 27 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
23 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 28 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
24 cat $(TOPDIR)/packages | grep -v '^#' | \ 29 cat $(TOPDIR)/packages | grep -v '^#' | \
25 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"; }' \ 30 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"; }' \
26 >> $(TOPDIR)/.depends 31 >> $(TOPDIR)/.depends
27# interpackage dependency generation 32# interpackage dependency generation
28 @cat $(TOPDIR)/packages | \ 33 @cat $(TOPDIR)/packages | \
29 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 34 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
30 35
31$(TOPDIR)/.depends.cfgs: 36$(TOPDIR)/.depends.cfgs:
32# config.in interdependencies 37# config.in interdependencies
33 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 38 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
34 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 39 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
35 @-rm -f dirs 40 @-rm -f dirs
36 41
37$(QTDIR)/stamp-headers : 42$(QTDIR)/stamp-headers :
38 @-rm -f $(QTDIR)/stamp-headers* 43 @-rm -f $(QTDIR)/stamp-headers*