[project @ 2005-06-16 01:17:09 by ross]

refactoring only: split Compiler type from Distribution.Setup,
to reduce dependencies.

diff --git a/ghc/lib/compat/Distribution/Compiler.hs b/ghc/lib/compat/Distribution/Compiler.hs
new file mode 100644 (file)
index 0000000..b5a2f68
--- /dev/null
+++ b/ghc/lib/compat/Distribution/Compiler.hs
@@ -0,0 +1,3 @@
+{-# OPTIONS -cpp #-}
+#include "Cabal/Distribution/Compiler.hs"
+-- dummy comment

diff --git a/ghc/lib/compat/Distribution/Setup.hs b/ghc/lib/compat/Distribution/Setup.hs
deleted file mode 100644 (file)
index 7088b61..0000000
--- a/ghc/lib/compat/Distribution/Setup.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-{-# OPTIONS -cpp #-}
-#include "Cabal/Distribution/Setup.hs"
--- dummy comment

diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile
index 2450ecf..b34c900 100644 (file)
--- a/ghc/lib/compat/Makefile
+++ b/ghc/lib/compat/Makefile
@@ -50,7 +50,7 @@ EXCLUDED_SRCS += \
        Distribution/License.hs \
        Distribution/Package.hs \
        Distribution/ParseUtils.hs \
-       Distribution/Setup.hs \
+       Distribution/Compiler.hs \
        Distribution/Version.hs
 endif
 
@@ -63,7 +63,7 @@ Distribution/InstalledPackageInfo.$(way_)o :  $(FPTOOLS_TOP)/libraries/Cabal/Dis
 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
 
 # Make the #includes in the stubs independent of the current location