summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-01-23 00:10:45 +0000
committerIan Lynagh <igloo@earth.li>2011-01-23 00:10:45 +0000
commit032dd778604f80378823af026a99850141ad6cd3 (patch)
treef56804ba20904265a395876456fbb9dec077f742 /includes
parentb36b42fdc0554447ead96305dc2979ffcd74aff9 (diff)
downloadhaskell-032dd778604f80378823af026a99850141ad6cd3.tar.gz
Tweak some deps to avoid multiple $(wildcard ...)s
Note that some things depending on the rts/includes header files now depend on more files: They used to include depend on includes/*.h, but now they also depend on header files in subdirectories. As far as I can see this was a bug.
Diffstat (limited to 'includes')
-rw-r--r--includes/ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk
index 374649330f..8411a26c15 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -135,7 +135,7 @@ includes_dist-derivedconstants_PROG = mkDerivedConstants$(exeext)
$(eval $(call build-prog,includes,dist-derivedconstants,0))
-$(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_FILES) $$(rts_H_FILES)
includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
ifneq "$(BINDIST)" "YES"
@@ -165,7 +165,7 @@ includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
$(eval $(call build-prog,includes,dist-ghcconstants,0))
ifneq "$(BINDIST)" "YES"
-$(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_FILES) $$(rts_H_FILES)
includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)