X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fcompat%2FMakefile;h=06c6103f7aa76e5617a1bbc3b376817b42ccf728;hb=45252b35151fc55aa19fb6770df5ed8267639083;hp=126e79416d0f0204b94735ad02048beeed209c59;hpb=29179ddf0e74282a773bbd979382f50af4164f57;p=ghc-hetmet.git

diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index 126e794..06c6103 100644
--- a/ghc/lib/compat/Makefile
+++ b/ghc/lib/compat/Makefile
@@ -6,6 +6,7 @@ ALL_DIRS = \
 	Compat \
 	Distribution \
 	Distribution/Compat \
+	Language/Haskell \
 	System \
 	System/Directory \
 	cbits
@@ -16,10 +17,14 @@ LIBRARY = libghccompat.a
 # We don't want this installed
 NO_INSTALL_LIBRARY = YES
 
+# Avoid building the GHCi lib, since we don't need it
+GhcWithInterpreter = NO
+
 # Needed so that the libraries can #include relative to this directory.
 INCLUDE_DIRS=-I. -Iinclude
 
-SRC_HC_OPTS    += $(INCLUDE_DIRS) 
+SRC_HC_OPTS    += $(INCLUDE_DIRS)
+SRC_CC_OPTS    += $(INCLUDE_DIRS)
 MKDEPENDC_OPTS += $(INCLUDE_DIRS)
 
 # Just to silence warnings
@@ -39,31 +44,30 @@ UseGhcForCc = YES
 SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts)) 
 
 ifeq "$(ghc_ge_603)" "YES"
-# These modules are all provided in GHC 6.3+
+# These modules are provided in GHC 6.3+
 EXCLUDED_SRCS += \
-	System/Directory/Internals.hs \
-	Distribution/Compat/ReadP.hs \
-	Distribution/Extension.hs \
-	Distribution/GetOpt.hs \
-	Distribution/InstalledPackageInfo.hs \
-	Distribution/License.hs \
-	Distribution/Package.hs \
-	Distribution/ParseUtils.hs \
-	Distribution/Setup.hs \
-	Distribution/Version.hs
+	System/Directory/Internals.hs
+
+SRC_MKDEPENDHS_OPTS += \
+	-optdep--exclude-module=System.Directory.Internals
+
+# GHC 6.3+ has Cabal, but we're replacing it:
+SRC_HC_OPTS += -ignore-package Cabal
 endif
 
-# Some explicit dependencies
+# Some explicit dependencies, needed because ghc -M can't discover the
+# true dependencies of these stub files.
 System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.hs
+Distribution/Compat/FilePath.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/FilePath.hs
 Distribution/Compat/ReadP.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs
-Distribution/Extension.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Extension.hs
 Distribution/GetOpt.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs
 Distribution/InstalledPackageInfo.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/InstalledPackageInfo.hs
 Distribution/License.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/License.hs
 Distribution/Package.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Package.hs
 Distribution/ParseUtils.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/ParseUtils.hs
-Distribution/Setup.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Setup.hs
+Distribution/Compiler.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compiler.hs
 Distribution/Version.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Version.hs
+Language/Haskell/Extension.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Language/Haskell/Extension.hs
 
 # Make the #includes in the stubs independent of the current location
 SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries