author | kergoth <kergoth> | 2002-11-05 18:01:18 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 18:01:18 (UTC) |
commit | bbacc58102236691c8161fac2674998ce428ac3c (patch) (unidiff) | |
tree | 11bdfeccc32ef606863fd19e8ff8c3e293721335 /Rules.make | |
parent | 19f22f15980791a734604a2323dc86a73787196c (diff) | |
download | opie-bbacc58102236691c8161fac2674998ce428ac3c.zip opie-bbacc58102236691c8161fac2674998ce428ac3c.tar.gz opie-bbacc58102236691c8161fac2674998ce428ac3c.tar.bz2 |
Update dependency generation, and ensure it uses the opie default config when none exists
-rw-r--r-- | Rules.make | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -3,8 +3,9 @@ | |||
3 | $(configs) : | 3 | $(configs) : |
4 | $(call makecfg,$@) | 4 | $(call makecfg,$@) |
5 | 5 | ||
6 | $(TOPDIR)/.depends : $(TOPDIR)/config.in | 6 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) |
7 | # add to subdir-y, and add descend rules | 7 | @echo Generating dependency information... |
8 | # add to subdir-y, and add descend rules | ||
8 | @cat $(TOPDIR)/packages | \ | 9 | @cat $(TOPDIR)/packages | \ |
9 | awk '/^#/ { next }; {print \ | 10 | awk '/^#/ { next }; {print \ |
10 | ".PHONY : " $$2 "\n" \ | 11 | ".PHONY : " $$2 "\n" \ |
@@ -13,12 +14,14 @@ $(TOPDIR)/.depends : $(TOPDIR)/config.in | |||
13 | "$$(call makefilegen,$$@)\n\n" \ | 14 | "$$(call makefilegen,$$@)\n\n" \ |
14 | $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\ | 15 | $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\ |
15 | > $(TOPDIR)/.depends | 16 | > $(TOPDIR)/.depends |
16 | # interpackage dependency generation | 17 | # interpackage dependency generation |
17 | @cat $(TOPDIR)/packages | \ | 18 | @cat $(TOPDIR)/packages | \ |
18 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends | 19 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends |
19 | # generation of config.in files, and config.in interdependencies | 20 | # generation of config.in files, and config.in interdependencies |
20 | find ./ -name config.in | ( for cfg in `cat`; do dir=`dirname $cfg`; name=`basename $dir`; if [ ! -e $dir/$name.pro ]; then echo $dir; fi; done; ) > dirs | 21 | @find $(TOPDIR)/ -name config.in | ( for cfg in `cat`; do dir=`dirname $$cfg`; name=`basename $$dir`; if [ ! -e $$dir/$$name.pro ]; then echo $$dir; fi; done; ) > dirs |
21 | cat dirs | for i in `cat`; do numlines="`cat dirs|grep $i 2>/dev/null|wc -l`"; if [ "$numlines" -ne "1" ]; then deps=`cat dirs|grep $i| grep -v "^$i$"|for i in \`cat|sed -e's,^./,$(TOPDIR)/,g'\`; do echo $i/config.in; done`; echo `echo $i|sed -e 's,^./,$(TOPDIR)/,'` : $deps; fi; done; | 22 | @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> .depends |
23 | @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 ) >> $(TOPDIR)/.depends | ||
24 | @-rm -f dirs | ||
22 | 25 | ||
23 | $(TOPDIR)/qmake/qmake : | 26 | $(TOPDIR)/qmake/qmake : |
24 | $(call descend,$(TOPDIR)/qmake) | 27 | $(call descend,$(TOPDIR)/qmake) |