summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 21:27:36 (UTC)
committer kergoth <kergoth>2002-11-06 21:27:36 (UTC)
commit1305bd1b6b9495783a1c189a206e4cc2b3d8d1c4 (patch) (side-by-side diff)
tree6168787185b7d2b7dd359528959baa4cd62266f0
parent11ce576fed7dbcafd64549abe9fc9398c1804231 (diff)
downloadopie-1305bd1b6b9495783a1c189a206e4cc2b3d8d1c4.zip
opie-1305bd1b6b9495783a1c189a206e4cc2b3d8d1c4.tar.gz
opie-1305bd1b6b9495783a1c189a206e4cc2b3d8d1c4.tar.bz2
Filter out itself when descending
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make5
1 files changed, 3 insertions, 2 deletions
diff --git a/Rules.make b/Rules.make
index d07372b..f85779c 100644
--- a/Rules.make
+++ b/Rules.make
@@ -7,13 +7,13 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
@echo Generating dependency information...
# add to subdir-y, and add descend rules
cat $(TOPDIR)/packages | grep -v '^#' | \
awk '{print \
".PHONY : " $$2 "\n" \
"subdir-$$(" $$1 ") += " $$2 "\n\n"; \
- print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(MAKECMDGOALS)))\n"; }' > $(TOPDIR)/.depends
+ print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
cat $(TOPDIR)/packages | grep -v '^#' | \
perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(TOPDIR)/qmake/qmake\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
>> $(TOPDIR)/.depends
# interpackage dependency generation
cat $(TOPDIR)/packages | \
$(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
@@ -78,12 +78,13 @@ $(TOPDIR)/mkspecs/default :
define descend
$(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
endef
define makefilegen
- cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `echo $(1)|sed -e 's,/Makefile$$,,g' -e 's,.*/,,g'`.pro
+ cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\` " | \
+ head -1 | awk '{print $$3}'`
endef
define makecfg
$(TOPDIR)/scripts/makecfg.pl $1
endef