X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=4d4723ba9ad358b01b22887e7a043d6bff99fb41;hb=5dc9a4504ea4d3df462081a7dbfde0431eac133e;hp=69fd1fda8fa7f9c470f558c3dc8b681cfc4fd5ea;hpb=9cb7f4755c5099148bea64bf34b1af2da462b158;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 69fd1fd..4d4723b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -477,7 +477,7 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -fno-generics -Rghc-timing \
-  -I. -IcodeGen -InativeGen -Iparser
+  -I. -Iparser
 
 # Omitted: 	-I$(GHC_INCLUDE_DIR)
 # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, 
@@ -854,6 +854,53 @@ TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs pa
 include $(TOP)/mk/target.mk
 
 # -----------------------------------------------------------------------------
+# Explicit dependencies
+
+# Some .hs files #include other source files, but since ghc -M doesn't spit out
+# these dependencies we have to include them manually.
+
+# We don't add dependencies on HsVersions.h, ghcautoconf.h, or ghc_boot_platform.h,
+# because then modifying one of these files would force recompilation of everything,
+# which is probably not what you want.  However, it does mean you have to be
+# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
+
+# Aargh, these don't work properly anyway, because GHC's recompilation checker
+# just reports "compilation NOT required".  Do we have to add -no-recomp for each
+# of these .hs files?  I haven't done anything about this yet.
+
+$(odir)/codeGen/Bitmap.$(way_)o		:  ../includes/MachDeps.h
+$(odir)/codeGen/CgCallConv.$(way_)o	:  ../includes/StgFun.h
+$(odir)/codeGen/CgProf.$(way_)o		:  ../includes/MachDeps.h
+$(odir)/codeGen/CgProf.$(way_)o		:  ../includes/Constants.h
+$(odir)/codeGen/CgProf.$(way_)o		:  ../includes/DerivedConstants.h
+$(odir)/codeGen/CgTicky.$(way_)o	:  ../includes/DerivedConstants.h
+$(odir)/codeGen/ClosureInfo.$(way_)o	:  ../includes/MachDeps.h
+$(odir)/codeGen/SMRep.$(way_)o		:  ../includes/MachDeps.h
+$(odir)/codeGen/SMRep.$(way_)o		:  ../includes/ClosureTypes.h
+$(odir)/ghci/ByteCodeAsm.$(way_)o	:  ../includes/Bytecodes.h
+$(odir)/ghci/ByteCodeFFI.$(way_)o	:  nativeGen/NCG.h
+$(odir)/ghci/ByteCodeInstr.$(way_)o	:  ../includes/MachDeps.h
+$(odir)/ghci/ByteCodeItbls.$(way_)o	:  ../includes/ClosureTypes.h
+$(odir)/ghci/ByteCodeItbls.$(way_)o	:  nativeGen/NCG.h
+$(odir)/main/Constants.$(way_)o		:  ../includes/MachRegs.h
+$(odir)/main/Constants.$(way_)o		:  ../includes/Constants.h
+$(odir)/main/Constants.$(way_)o		:  ../includes/MachDeps.h
+$(odir)/main/Constants.$(way_)o		:  ../includes/DerivedConstants.h
+$(odir)/main/Constants.$(way_)o		:  ../includes/GHCConstants.h
+$(odir)/nativeGen/AsmCodeGen.$(way_)o 	:  nativeGen/NCG.h
+$(odir)/nativeGen/MachCodeGen.$(way_)o 	:  nativeGen/NCG.h
+$(odir)/nativeGen/MachCodeGen.$(way_)o 	: ../includes/MachDeps.h
+$(odir)/nativeGen/MachInstrs.$(way_)o	:  nativeGen/NCG.h
+$(odir)/nativeGen/MachRegs.$(way_)o	:  nativeGen/NCG.h
+$(odir)/nativeGen/MachRegs.$(way_)o	:  ../includes/MachRegs.h
+$(odir)/nativeGen/PositionIndependentCode.$(way_)o :  nativeGen/NCG.h
+$(odir)/nativeGen/PprMach.$(way_)o	:  nativeGen/NCG.h
+$(odir)/nativeGen/RegAllocInfo.$(way_)o :  nativeGen/NCG.h
+$(odir)/typecheck/TcForeign.$(way_)o	:  nativeGen/NCG.h
+$(odir)/utils/Binary.$(way_)o		:  ../includes/MachDeps.h
+$(odir)/utils/FastMutInt.$(way_)o	:  ../includes/MachDeps.h
+
+# -----------------------------------------------------------------------------
 # Dependencies
 
 MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))