summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-02-11 18:33:25 (UTC)
committer kergoth <kergoth>2003-02-11 18:33:25 (UTC)
commitec6795c6a15a3b9f4721b628d48366097da9c903 (patch) (side-by-side diff)
tree0e3aa849eda2a9258313faf45b0b86eb3f2a120b
parentfdeb607c2222e36bbf817114088317b15219af78 (diff)
downloadopie-ec6795c6a15a3b9f4721b628d48366097da9c903.zip
opie-ec6795c6a15a3b9f4721b628d48366097da9c903.tar.gz
opie-ec6795c6a15a3b9f4721b628d48366097da9c903.tar.bz2
individual makefiles depend on toplevel .config, to ensure regen of makefiles on config change.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Rules.make4
1 files changed, 1 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index d5c6b24..16c6455 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,10 +1,8 @@
-## targets ##
-
$(configs) :
$(call makecfg,$@)
$(TOPDIR)/gen.pro : $(TOPDIR)/.config
echo > $@
ifneq ($(CONFIG_DEBUG),)
echo CONFIG += debug >> $@
echo CONFIG -= release >> $@
@@ -17,17 +15,17 @@ $(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 $$@,$$(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 \$$(QMAKE) \$$(OPIEDIR)/gen.pro\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) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
>> $(TOPDIR)/.depends
# interpackage dependency generation
@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