X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2Fghc.mk;h=8d4fd473c04a4a1d02da50124dbecf1365a89c65;hp=eeb52bac4f584d9fab15be2eed9d7cc0a6afee1c;hb=afdc0885532e8fb28840e8b78b02056c64fbaf77;hpb=e8a42ae2991013f586cb0606fcbd70d9b4c41d6f

diff --git a/includes/ghc.mk b/includes/ghc.mk
index eeb52ba..8d4fd47 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -27,6 +27,8 @@ includes_H_SUBDIRS += rts/storage
 includes_H_SUBDIRS += stg
 
 includes_H_FILES := $(wildcard $(patsubst %,includes/%/*.h,$(includes_H_SUBDIRS)))
+# This isn't necessary, but it makes the paths look a little prettier
+includes_H_FILES := $(subst /./,/,$(includes_H_FILES))
 
 #
 # Options
@@ -135,7 +137,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 +167,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)
 
@@ -191,9 +193,9 @@ install: install_includes
 .PHONY: install_includes
 install_includes :
 	$(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)")
-	for d in $(includes_H_SUBDIRS); do \
-		$(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$$d"); \
-		$(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$$d/*.h,"$(DESTDIR)$(ghcheaderdir)/$$d/"); \
-	done
+	$(foreach d,$(includes_H_SUBDIRS), \
+	    $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$d") && \
+	    $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$d/*.h,"$(DESTDIR)$(ghcheaderdir)/$d/") && \
+	) true
 	$(call INSTALL_HEADER,$(INSTALL_OPTS),$(includes_H_CONFIG) $(includes_H_PLATFORM),"$(DESTDIR)$(ghcheaderdir)/")