[project @ 2001-05-24 13:59:09 by simonpj]

[ghc-hetmet.git] / ghc / compiler / compMan / CmStaticInfo.lhs

diff --git a/ghc/compiler/compMan/CmStaticInfo.lhs b/ghc/compiler/compMan/CmStaticInfo.lhs
index e267d70..0c310f8 100644 (file)
--- a/ghc/compiler/compMan/CmStaticInfo.lhs
+++ b/ghc/compiler/compMan/CmStaticInfo.lhs
@@ -4,7 +4,7 @@
 \section[CmStaticInfo]{Session-static info for the Compilation Manager}
 
 \begin{code}
-module CmStaticInfo ( GhciMode(..), Package(..), PackageConfigInfo, defaultPackage )
+module CmStaticInfo ( GhciMode(..), PackageConfig(..), defaultPackageConfig )
 where
 
 #include "HsVersions.h"
@@ -15,37 +15,5 @@ where
 data GhciMode = Batch | Interactive | OneShot 
      deriving Eq
 
-type PackageConfigInfo = [Package]
-
-data Package
-   = Package {
-       name            :: String,
-       import_dirs     :: [String],
-       source_dirs     :: [String],
-       library_dirs    :: [String],
-       hs_libraries    :: [String],
-       extra_libraries :: [String],
-       include_dirs    :: [String],
-       c_includes      :: [String],
-       package_deps    :: [String],
-       extra_ghc_opts  :: [String],
-       extra_cc_opts   :: [String],
-       extra_ld_opts   :: [String]
-     }
-
-defaultPackage
-   = Package {
-       name = error "defaultPackage",
-       import_dirs     = [],
-       source_dirs     = [],
-       library_dirs    = [],
-       hs_libraries    = [],
-       extra_libraries = [],
-       include_dirs    = [],
-       c_includes      = [],
-       package_deps    = [],
-       extra_ghc_opts  = [],
-       extra_cc_opts   = [],
-       extra_ld_opts   = []
-    }
+#include "../utils/ghc-pkg/Package.hs"
 \end{code}