summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 19:09:47 (UTC)
committer kergoth <kergoth>2002-11-05 19:09:47 (UTC)
commit4dcdaefc531c23d004f676271d862678cf6d377f (patch) (side-by-side diff)
treecd7406e08c54840f050dc17a68a5e3527f9f0685
parentae03ae8f335b0f018b9ed147e66a59ee14ccc2f1 (diff)
downloadopie-4dcdaefc531c23d004f676271d862678cf6d377f.zip
opie-4dcdaefc531c23d004f676271d862678cf6d377f.tar.gz
opie-4dcdaefc531c23d004f676271d862678cf6d377f.tar.bz2
rule consolodation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make7
1 files changed, 2 insertions, 5 deletions
diff --git a/Rules.make b/Rules.make
index 5943b93..33ff350 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,12 +1,12 @@
## targets ##
$(configs) :
$(call makecfg,$@)
-$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config
+$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
@echo Generating dependency information...
# add to subdir-y, and add descend rules
@cat $(TOPDIR)/packages | \
awk '/^#/ { next }; {print \
".PHONY : " $$2 "\n" \
"subdir-$$(" $$1 ") += " $$2 "\n\n" \
@@ -22,16 +22,13 @@ $(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'\``" >> $@
@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 :
- $(call descend,$(TOPDIR)/qmake)
-
-$(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 :
+$(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 $(TOPDIR)/qmake/qmake :
$(call descend,$(shell dirname $@),$(shell basename $@))
## general rules ##
define descend
$(MAKE) -C $(1) $(2)