[project @ 2005-12-19 13:08:19 by simonpj]

[ghc-hetmet.git] / ghc / lib / compat / Makefile

diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index 943b56c..06c6103 100644 (file)
--- a/ghc/lib/compat/Makefile
+++ b/ghc/lib/compat/Makefile
@@ -17,6 +17,9 @@ 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
 
@@ -41,36 +44,21 @@ 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/FilePath.hs \
-       Distribution/Compat/ReadP.hs \
-       Distribution/GetOpt.hs \
-       Distribution/InstalledPackageInfo.hs \
-       Distribution/License.hs \
-       Distribution/Package.hs \
-       Distribution/ParseUtils.hs \
-       Distribution/Compiler.hs \
-       Distribution/Version.hs \
-       Language/Haskell/Extension.hs
+       System/Directory/Internals.hs
 
 SRC_MKDEPENDHS_OPTS += \
-       -optdep--exclude-module=System.Directory.Internals \
-       -optdep--exclude-module=Distribution.Compat.FilePath \
-       -optdep--exclude-module=Distribution.Compat.ReadP \
-       -optdep--exclude-module=Distribution.GetOpt \
-       -optdep--exclude-module=Distribution.InstalledPackageInfo \
-       -optdep--exclude-module=Distribution.License \
-       -optdep--exclude-module=Distribution.Package \
-       -optdep--exclude-module=Distribution.ParseUtils \
-       -optdep--exclude-module=Distribution.Compiler \
-       -optdep--exclude-module=Distribution.Version \
-       -optdep--exclude-module=Language.Haskell.Extension
+       -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/GetOpt.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs
 Distribution/InstalledPackageInfo.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/InstalledPackageInfo.hs