summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 18:06:36 (UTC)
committer kergoth <kergoth>2003-01-16 18:06:36 (UTC)
commitd27bce3128744350adace08d0768c846acc48a04 (patch) (side-by-side diff)
treebf9a54e8de5d384c6df5d5cf8c579d0378d8d7e7
parentc984baa73724d079076b28788c174ce9fa83fdb5 (diff)
downloadopie-d27bce3128744350adace08d0768c846acc48a04.zip
opie-d27bce3128744350adace08d0768c846acc48a04.tar.gz
opie-d27bce3128744350adace08d0768c846acc48a04.tar.bz2
Rules.make
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index 92286c6..126e6af 100644
--- a/Rules.make
+++ b/Rules.make
@@ -3,22 +3,22 @@
$(configs) :
$(call makecfg,$@)
$(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 | grep -v '^#' | \
+ @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 $$@,$$(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"; }' \
+ perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(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:
# config.in interdependencies
@echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
@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 ) >> $@