| author | kergoth <kergoth> | 2002-11-05 20:11:47 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-11-05 20:11:47 (UTC) |
| commit | e1debaf85105673962fd9e5d6d05c4cf8668164b (patch) (side-by-side diff) | |
| tree | a577c78480eb8230a6671235b203fe184968efac | |
| parent | dd60e5b7e5b851fb9206e6dbb87fda6f043bac12 (diff) | |
| download | opie-e1debaf85105673962fd9e5d6d05c4cf8668164b.zip opie-e1debaf85105673962fd9e5d6d05c4cf8668164b.tar.gz opie-e1debaf85105673962fd9e5d6d05c4cf8668164b.tar.bz2 | |
Set generated configs in Makefile.test for now
| -rw-r--r-- | Makefile.test | 2 | ||||
| -rw-r--r-- | Rules.make | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.test b/Makefile.test index 392ea37..cf9f28c 100644 --- a/Makefile.test +++ b/Makefile.test @@ -5,6 +5,8 @@ export TOPDIR:=$(OPIEDIR) export QMAKESPECSDIR=$(OPIEDIR)/mkspecs export QMAKESPEC=$(QMAKESPECSDIR)/qws/linux-generic-g++ +configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/x11/ipc/server/config.in $(TOPDIR)/x11/ipc/config.in $(TOPDIR)/x11/config.in /usr/src/coding/projects/userspace/opie/config.in + # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) # in order to have a full set of config.in files. # .depends depends on $(TOPDIR)/.config @@ -19,9 +19,8 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) $(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'\``" >> $@ +# config.in interdependencies + @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs @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 |