summaryrefslogtreecommitdiff
authorclem <clem>2004-10-14 20:30:23 (UTC)
committer clem <clem>2004-10-14 20:30:23 (UTC)
commitd4bace84a2abfd1b4b242c24258961d093e38054 (patch) (unidiff)
tree1a18d97587de072dedfb0f6856c39c5f4086f205
parent686f3265f6a39144692b1a6360159df96dd0b41e (diff)
downloadopie-d4bace84a2abfd1b4b242c24258961d093e38054.zip
opie-d4bace84a2abfd1b4b242c24258961d093e38054.tar.gz
opie-d4bace84a2abfd1b4b242c24258961d093e38054.tar.bz2
allow distribution inside *one* single directory, +ing the call descend as in the previous commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rules.make b/Rules.make
index a8a8c26..2f32c04 100644
--- a/Rules.make
+++ b/Rules.make
@@ -123,13 +123,13 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
123 @echo Generating dependency information... 123 @echo Generating dependency information...
124# add to subdir-y, and add descend rules 124# add to subdir-y, and add descend rules
125 @cat $(TOPDIR)/packages | grep -v '^#' | \ 125 @cat $(TOPDIR)/packages | grep -v '^#' | \
126 awk '{print \ 126 awk '{print \
127 ".PHONY : " $$2 "\n" \ 127 ".PHONY : " $$2 "\n" \
128 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 128 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
129 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 129 print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
130 cat $(TOPDIR)/packages | grep -v '^#' | \ 130 cat $(TOPDIR)/packages | grep -v '^#' | \
131 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 131 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
132 >> $(TOPDIR)/.depends 132 >> $(TOPDIR)/.depends
133# interpackage dependency generation 133# interpackage dependency generation
134 @cat $(TOPDIR)/packages | \ 134 @cat $(TOPDIR)/packages | \
135 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 135 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends