X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2Fghc.mk;h=50107eda37f8142ea9de4c6e785fcbeb06803f13;hb=9a9803e8dc80ba41bd3e2d31228e64fa6b61060e;hp=763f8c761170a7abf7eb4cc2a3520a70907e231a;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/includes/ghc.mk b/includes/ghc.mk
index 763f8c7..50107ed 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -33,14 +33,7 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 includes_CC_OPTS += -DTABLES_NEXT_TO_CODE
 endif
 
-includes_CC_OPTS += -Iincludes -Irts -Irts/parallel
-ifeq "$(HaveLibGmp)" "YES"
-ifneq "$(GMP_INCLUDE_DIRS)" ""
-includes_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
-endif
-else
-includes_CC_OPTS += -Igmp/gmpbuild
-endif
+includes_CC_OPTS += -Iincludes -Irts
 
 ifneq "$(GhcWithSMP)" "YES"
 includes_CC_OPTS += -DNOSMP
@@ -72,8 +65,8 @@ $(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk
 
 endif
 
-$(includes_H_PLATFORM) : Makefile
-	$(RM) $@
+$(includes_H_PLATFORM) : includes/Makefile
+	"$(RM)" $(RM_OPTS) $@
 	@echo "Creating $@..."
 	@echo "#ifndef __GHCPLATFORM_H__"  >$@
 	@echo "#define __GHCPLATFORM_H__" >>$@
@@ -136,7 +129,7 @@ includes_dist-derivedconstants_PROG   = mkDerivedConstants$(exeext)
 
 $(eval $(call build-prog,includes,dist-derivedconstants,0))
 
-$(includes_dist-derivedconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM)
+$(includes_dist-derivedconstants_depfile) : $(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"
@@ -166,7 +159,7 @@ includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
 $(eval $(call build-prog,includes,dist-ghcconstants,0))
 
 ifneq "$(BINDIST)" "YES"
-$(includes_dist-ghcconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM)
+$(includes_dist-ghcconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
 
 includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)