X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2Fghc.mk;h=374649330f7ba70e75ecc1b67bb9d2aa4c05961a;hb=5775d5142da227d65fb86994d363eb16841ee642;hp=68055b564eaf4bbf30b4b348cf4eb75e14d458bc;hpb=7c63589a7f9f1f7958efcb48829fc72fc8f312fd;p=ghc-hetmet.git

diff --git a/includes/ghc.mk b/includes/ghc.mk
index 68055b5..3746493 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -18,9 +18,15 @@ includes_H_CONFIG   = includes/ghcautoconf.h
 includes_H_PLATFORM = includes/ghcplatform.h
 
 #
-# All header files
+# All header files are in includes/{one of these subdirectories}
 #
-includes_H_FILES = $(filter-out $(includes_H_CONFIG) $(includes_H_PLATFORM),$(wildcard includes/*.h includes/*/*.h includes/*/*/*.h))
+includes_H_SUBDIRS += .
+includes_H_SUBDIRS += rts
+includes_H_SUBDIRS += rts/prof
+includes_H_SUBDIRS += rts/storage
+includes_H_SUBDIRS += stg
+
+includes_H_FILES := $(wildcard $(patsubst %,includes/%/*.h,$(includes_H_SUBDIRS)))
 
 #
 # Options
@@ -180,16 +186,14 @@ $(eval $(call all-target,includes,,\
   $(includes_H_CONFIG) $(includes_H_PLATFORM) \
   $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS)))
 
-includes_subdirs = $(sort $(subst includes/,,$(foreach d,$(includes_H_FILES),$(dir $(d)))))
-
 install: install_includes
 
 .PHONY: install_includes
 install_includes :
-	$(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
-	for d in $(includes_subdirs); do \
-		$(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)/$$d"; \
-	done
-	for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \
-		$(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i "$(DESTDIR)$(ghcheaderdir)/$$i"; \
-	done
+	$(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)")
+	$(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)/")
+