| author | kergoth <kergoth> | 2002-11-05 18:01:18 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-05 18:01:18 (UTC) |
| commit | bbacc58102236691c8161fac2674998ce428ac3c (patch) (side-by-side diff) | |
| 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 @@ $(configs) : $(call makecfg,$@) -$(TOPDIR)/.depends : $(TOPDIR)/config.in - # add to subdir-y, and add descend rules +$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) + @echo Generating dependency information... +# add to subdir-y, and add descend rules @cat $(TOPDIR)/packages | \ awk '/^#/ { next }; {print \ ".PHONY : " $$2 "\n" \ @@ -13,12 +14,14 @@ $(TOPDIR)/.depends : $(TOPDIR)/config.in "$$(call makefilegen,$$@)\n\n" \ $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\ > $(TOPDIR)/.depends - # interpackage dependency generation +# interpackage dependency generation @cat $(TOPDIR)/packages | \ $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends - # generation of config.in files, and config.in interdependencies - 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 - 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; +# generation of config.in files, and config.in interdependencies + @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 + @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> .depends + @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 + @-rm -f dirs $(TOPDIR)/qmake/qmake : $(call descend,$(TOPDIR)/qmake) |