summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 17:37:14 (UTC)
committer kergoth <kergoth>2002-11-05 17:37:14 (UTC)
commite0ad922e8a2599a9c3f5c4b2ef32f18d4ac6b44c (patch) (unidiff)
tree72a2d40e09ad865e0082d7ff204fc4160482bedd
parentcf2ae9bf818d7cdddc56a3d6eea21ded4e815b68 (diff)
downloadopie-e0ad922e8a2599a9c3f5c4b2ef32f18d4ac6b44c.zip
opie-e0ad922e8a2599a9c3f5c4b2ef32f18d4ac6b44c.tar.gz
opie-e0ad922e8a2599a9c3f5c4b2ef32f18d4ac6b44c.tar.bz2
Rule consolodation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make18
1 files changed, 7 insertions, 11 deletions
diff --git a/Rules.make b/Rules.make
index 96e528b..362659a 100644
--- a/Rules.make
+++ b/Rules.make
@@ -4,6 +4,7 @@ $(configs) :
4 $(call makecfg,$@) 4 $(call makecfg,$@)
5 5
6$(TOPDIR)/.depends : $(TOPDIR)/config.in 6$(TOPDIR)/.depends : $(TOPDIR)/config.in
7 # add to subdir-y, and add descend rules
7 @cat $(TOPDIR)/packages | \ 8 @cat $(TOPDIR)/packages | \
8 awk '/^#/ { next }; {print \ 9 awk '/^#/ { next }; {print \
9 ".PHONY : " $$2 "\n" \ 10 ".PHONY : " $$2 "\n" \
@@ -12,23 +13,18 @@ $(TOPDIR)/.depends : $(TOPDIR)/config.in
12 "$$(call makefilegen,$$@)\n\n" \ 13 "$$(call makefilegen,$$@)\n\n" \
13 $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\ 14 $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\
14 > $(TOPDIR)/.depends 15 > $(TOPDIR)/.depends
16 # interpackage dependency generation
15 @cat $(TOPDIR)/packages | \ 17 @cat $(TOPDIR)/packages | \
16 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 18 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
19 # 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 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;
17 22
18$(TOPDIR)/qmake/qmake : 23$(TOPDIR)/qmake/qmake :
19 $(call descend,$(TOPDIR)/qmake) 24 $(call descend,$(TOPDIR)/qmake)
20 25
21$(TOPDIR)/scripts/lxdialog/lxdialog : 26$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf :
22 $(call descend,$(TOPDIR)/scripts/lxdialog) 27 $(call descend,$(shell dirname $@),$(shell basename $@))
23
24$(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf:
25 $(call descend,$(TOPDIR)/scripts/kconfig,conf)
26
27$(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf:
28 $(call descend,$(TOPDIR)/scripts/kconfig,mconf)
29
30$(TOPDIR)/scripts/kconfig/qconf scripts/kconfijg/qconf:
31 $(call descend,$(TOPDIR)/scripts/kconfig,qconf)
32 28
33## general rules ## 29## general rules ##
34 30