| author | kergoth <kergoth> | 2002-11-05 18:26:02 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-05 18:26:02 (UTC) |
| commit | 468f1826ade3afaf7a8b8587b297d9ec6e0ccf3f (patch) (side-by-side diff) | |
| tree | 76a3e2002b736da582de22852c9b4e7cfa6de2f2 /Rules.make | |
| parent | bbacc58102236691c8161fac2674998ce428ac3c (diff) | |
| download | opie-468f1826ade3afaf7a8b8587b297d9ec6e0ccf3f.zip opie-468f1826ade3afaf7a8b8587b297d9ec6e0ccf3f.tar.gz opie-468f1826ade3afaf7a8b8587b297d9ec6e0ccf3f.tar.bz2 | |
Rearranged root makefile to fix dependencies on make targets, split config.in generation rules into .depends.cfgs
| -rw-r--r-- | Rules.make | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -3,7 +3,7 @@ $(configs) : $(call makecfg,$@) -$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) +$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config @echo Generating dependency information... # add to subdir-y, and add descend rules @cat $(TOPDIR)/packages | \ @@ -17,10 +17,12 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) # interpackage dependency generation @cat $(TOPDIR)/packages | \ $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends + +$(TOPDIR)/.depends.cfgs: # 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 + @echo "configs += `echo \`cat dirs | sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g' -e's,$$,/config.in,g'\``" >> $@ + @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 ) >> $@ @-rm -f dirs $(TOPDIR)/qmake/qmake : |