From 41fef65c5922634a3129e7105e345747806d38b8 Mon Sep 17 00:00:00 2001
From: ross <unknown>
Date: Tue, 21 Jun 2005 15:11:40 +0000
Subject: [PATCH] [project @ 2005-06-21 15:11:38 by ross] split
 Distribution.Extension between Language.Haskell.Extension
 (just the type, which will also be useful when
 haskell-src-exts is merged) and Distribution.Compiler
 (mappings to compiler options).

---
 ghc/lib/compat/Distribution/Extension.hs     |    3 ---
 ghc/lib/compat/Language/Haskell/Extension.hs |    3 +++
 ghc/lib/compat/Makefile                      |   11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 ghc/lib/compat/Distribution/Extension.hs
 create mode 100644 ghc/lib/compat/Language/Haskell/Extension.hs

diff --git a/ghc/lib/compat/Distribution/Extension.hs b/ghc/lib/compat/Distribution/Extension.hs
deleted file mode 100644
index f511df2..0000000
--- a/ghc/lib/compat/Distribution/Extension.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-{-# OPTIONS -cpp #-}
-#include "Cabal/Distribution/Extension.hs"
--- dummy comment
diff --git a/ghc/lib/compat/Language/Haskell/Extension.hs b/ghc/lib/compat/Language/Haskell/Extension.hs
new file mode 100644
index 0000000..410a07b
--- /dev/null
+++ b/ghc/lib/compat/Language/Haskell/Extension.hs
@@ -0,0 +1,3 @@
+{-# OPTIONS -cpp #-}
+#include "Cabal/Language/Haskell/Extension.hs"
+-- dummy comment
diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index 5083e49..654411d 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
@@ -44,32 +45,31 @@ ifeq "$(ghc_ge_603)" "YES"
 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/Compiler.hs \
-	Distribution/Version.hs
+	Distribution/Version.hs \
+	Language/Haskell/Extension.hs
 
 SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=System.Directory.Internals \
 	-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.Compiler \
-	-optdep--exclude-module=Distribution.Version
+	-optdep--exclude-module=Distribution.Version \
+	-optdep--exclude-module=Language.Haskell.Extension
 endif
 
 # Some explicit dependencies
 System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.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
@@ -77,6 +77,7 @@ Distribution/Package.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Pac
 Distribution/ParseUtils.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Distribution/ParseUtils.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
-- 
1.7.10.4