X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2Fghc.mk;h=111b94987e9e98acc635c6807558296a61288b40;hb=9ba922ee06b048774d7a82964867ff768a78126e;hp=a266bf4c6abbeb0b7c3ef1ed33491ad4d8981ad4;hpb=e53ba3592da5f72d1f701981126dbd28db9df98c;p=ghc-hetmet.git

diff --git a/includes/ghc.mk b/includes/ghc.mk
index a266bf4..111b949 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -20,7 +20,7 @@ includes_H_PLATFORM = includes/ghcplatform.h
 #
 # All header files
 #
-includes_H_FILES = $(filter-out $(includes_H_CONFIG) $(includes_H_PLATFORM),$(wildcard includes/*.h))
+includes_H_FILES = $(filter-out $(includes_H_CONFIG) $(includes_H_PLATFORM),$(wildcard includes/*.h includes/*/*.h includes/*/*/*.h))
 
 #
 # Options
@@ -33,7 +33,7 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 includes_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
-includes_CC_OPTS += -Iincludes -Irts -Irts/parallel
+includes_CC_OPTS += -Iincludes -Irts
 
 ifneq "$(GhcWithSMP)" "YES"
 includes_CC_OPTS += -DNOSMP
@@ -46,7 +46,7 @@ endif
 
 ifneq "$(BINDIST)" "YES"
 
-ifneq "$(TARGETPLATFORM)"  "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 $(includes_H_CONFIG) :
 	@echo "*** Cross-compiling: please copy $(includes_H_CONFIG) from the target system"
@@ -116,7 +116,7 @@ endif
 
 includes_DERIVEDCONSTANTS = includes/DerivedConstants.h
 
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 DerivedConstants.h :
 	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@ -127,9 +127,9 @@ else
 includes_dist-derivedconstants_C_SRCS = mkDerivedConstants.c
 includes_dist-derivedconstants_PROG   = mkDerivedConstants$(exeext)
 
-$(eval $(call build-prog,includes,dist-derivedconstants,0))
+$(eval $(call build-prog,includes,dist-derivedconstants,1))
 
-$(includes_dist-derivedconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM)
+$(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
 includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
 
 ifneq "$(BINDIST)" "YES"
@@ -144,7 +144,7 @@ endif
 
 includes_GHCCONSTANTS = includes/GHCConstants.h
 
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
 
 $(includes_GHCCONSTANTS) :
 	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@ -156,10 +156,10 @@ includes_dist-ghcconstants_C_SRCS = mkDerivedConstants.c
 includes_dist-ghcconstants_PROG   = mkGHCConstants$(exeext)
 includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
 
-$(eval $(call build-prog,includes,dist-ghcconstants,0))
+$(eval $(call build-prog,includes,dist-ghcconstants,1))
 
 ifneq "$(BINDIST)" "YES"
-$(includes_dist-ghcconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM)
+$(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
 
 includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
 
@@ -172,8 +172,6 @@ endif
 # ---------------------------------------------------------------------------
 # Install all header files
 
-INSTALL_HEADERS += $(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)
-
 $(eval $(call clean-target,includes,,\
   $(includes_H_CONFIG) $(includes_H_PLATFORM) \
   $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS)))
@@ -182,3 +180,16 @@ $(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