Reorganisation of the source tree

[ghc-hetmet.git] / compat / compat.mk

diff --git a/ghc/lib/compat/compat.mk b/compat/compat.mk
similarity index 87%
rename from ghc/lib/compat/compat.mk
rename to compat/compat.mk
index 156f033..48b2bea 100644 (file)
--- a/ghc/lib/compat/compat.mk
+++ b/compat/compat.mk
@@ -1,14 +1,14 @@
 # Settings for using the libghccompat.a library elsewhere in the build
 # tree: this file is just included into Makefiles, see 
-# ghc/utils/ghc-pkg/Makefile for example.
+# utils/ghc-pkg/Makefile for example.
 #
 # This is a poor-mans package, but simpler because we don't
 # have to deal with variations in the package support of different
 # versions of GHC.
 
 # Use libghccompat.a:
-SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
-SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+SRC_HC_OPTS += -i$(GHC_COMPAT_DIR)
+SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
 
 # Do *not* use the installed Cabal:
 ifeq "$(ghc_ge_603)" "YES"
@@ -16,7 +16,7 @@ SRC_HC_OPTS += -ignore-package Cabal
 endif
 
 # And similarly for when booting from .hc files:
-HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR)
+HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR)
 HC_BOOT_LIBS += -lghccompat
 
 ifeq "$(Windows)" "YES"
@@ -30,6 +30,7 @@ endif
 SRC_MKDEPENDHS_OPTS += \
        -optdep--exclude-module=Compat.RawSystem \
        -optdep--exclude-module=Compat.Directory \
+       -optdep--exclude-module=Compat.Unicode \
        -optdep--exclude-module=Distribution.Compat.FilePath \
        -optdep--exclude-module=Distribution.Compat.ReadP \
        -optdep--exclude-module=Distribution.Extension \