X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2Fghc-pkg%2FMakefile;h=6d12d3792eba37acde7315b98b286d2c025964a2;hb=1957057da8b5fa97478cfaf3aebd78294f5215fb;hp=bab6a3775f640d7436bdd1da533eb1500c5649d9;hpb=e8d07af14d22cc4be86960fe5cbdc7630a495836;p=ghc-hetmet.git

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index bab6a37..6d12d37 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -11,11 +11,8 @@ INSTALLING=1
 
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
-SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
-SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
-# And similarly for when booting from .hc files:
-HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR)
-HC_BOOT_LIBS += -lghccompat
+# This causes libghccompat.a to be used:
+include $(GHC_LIB_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
@@ -48,22 +45,6 @@ HS_PROG           = ghc-pkg.bin
 INSTALL_LIBEXECS += $(HS_PROG)
 endif
 
-# This is horrible.  We ought to be able to omit the entire directory
-# from mkDependHS.
-SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=Compat.RawSystem \
-	-optdep--exclude-module=Compat.Directory \
-	-optdep--exclude-module=Distribution.Compat.ReadP \
-	-optdep--exclude-module=Distribution.Extension \
-	-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.Setup \
-	-optdep--exclude-module=Distribution.Version \
-	-optdep--exclude-module=System.Directory.Internals
-
 # -----------------------------------------------------------------------------=
 # Create the Version.hs file