[project @ 2005-01-18 12:18:11 by simonpj]

[ghc-hetmet.git] / ghc / compiler / main / DriverMkDepend.hs

diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs
index dda568f..73fba48 100644 (file)
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/ghc/compiler/main/DriverMkDepend.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverMkDepend.hs,v 1.34 2004/11/26 16:20:52 simonmar Exp $
+-- $Id: DriverMkDepend.hs,v 1.36 2005/01/18 12:18:28 simonpj Exp $
 --
 -- GHC Driver
 --
@@ -13,12 +13,12 @@ module DriverMkDepend (
 
 #include "HsVersions.h"
 
-import HscTypes                ( IfacePackage(..) )
-import GetImports      ( getImports )
+import GetImports      ( getImportsFromFile )
 import CmdLineOpts     ( DynFlags )
 import DriverState      
 import DriverUtil
 import DriverFlags
+import Packages                ( PackageIdH(..) )
 import SysTools                ( newTempName )
 import qualified SysTools
 import Module          ( Module, ModLocation(..), moduleUserString)
@@ -123,8 +123,8 @@ beginMkDependHS = do
 
 
 doMkDependHSPhase dflags basename suff input_fn
- = do src <- readFile input_fn
-      let (import_sources, import_normals, mod_name) = getImports src
+ = do (import_sources, import_normals, mod_name) 
+               <- getImportsFromFile dflags input_fn
       let orig_fn = basename ++ '.':suff
       location' <- mkHomeModLocation mod_name orig_fn
 
@@ -248,7 +248,7 @@ findDependency dflags is_source src imp = do
        case r of 
           Found loc pkg
                -- not in this package: we don't need a dependency
-               | ExternalPackage _ <- pkg, not include_prelude
+               | ExtPackage _ <- pkg, not include_prelude
                -> return Nothing
 
                -- normal import: just depend on the .hi file