summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 23:06:25 (UTC)
committer kergoth <kergoth>2002-11-05 23:06:25 (UTC)
commitd938bdeeb9ed88d094ed272e35bd918591ab5d20 (patch) (side-by-side diff)
tree500041bcca3d181040b64d8ac85ebd07edef953f
parentad90e0f7ee5415d4ec210f1e96d14b6badd3034d (diff)
downloadopie-d938bdeeb9ed88d094ed272e35bd918591ab5d20.zip
opie-d938bdeeb9ed88d094ed272e35bd918591ab5d20.tar.gz
opie-d938bdeeb9ed88d094ed272e35bd918591ab5d20.tar.bz2
will descend into dirs that dont have .lpro files now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make16
1 files changed, 8 insertions, 8 deletions
diff --git a/Rules.make b/Rules.make
index 4e2a6c5..ead629f 100644
--- a/Rules.make
+++ b/Rules.make
@@ -6,16 +6,16 @@ $(configs) :
$(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 \
+ cat $(TOPDIR)/packages | grep -v '^#' | \
+ awk '{print \
".PHONY : " $$2 "\n" \
- "subdir-$$(" $$1 ") += " $$2 "\n\n" \
- $$2 "/Makefile : " $$2 "/" $$3 " $$(TOPDIR)/qmake/qmake\n\t" \
- "$$(call makefilegen,$$@)\n\n" \
- $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\n"}'\
- > $(TOPDIR)/.depends
+ "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
+ print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@)\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 | \
+ cat $(TOPDIR)/packages | \
$(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
$(TOPDIR)/.depends.cfgs: