X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverMkDepend.hs;h=d1673ff38d1cd390cbd90f04a56466995e79ac03;hb=483817dd051f011218c3c7041809ef019a7ebd0d;hp=970178d47df01da90f975cdf23ad51fd6dca7a04;hpb=e0521ba85231387847e899cb2700a211c4d3af6b;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs index 970178d..d1673ff 100644 --- a/ghc/compiler/main/DriverMkDepend.hs +++ b/ghc/compiler/main/DriverMkDepend.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverMkDepend.hs,v 1.14 2001/08/02 16:35:10 simonmar Exp $ +-- $Id: DriverMkDepend.hs,v 1.16 2001/12/04 19:26:17 sof Exp $ -- -- GHC Driver -- @@ -19,7 +19,7 @@ import qualified SysTools import Module import Config import Module ( isHomeModule ) -import Finder ( findModule ) +import Finder ( findModuleDep ) import HscTypes ( ModuleLocation(..) ) import Util import Panic @@ -53,14 +53,14 @@ depEndMarker = "# DO NOT DELETE: End of Haskell dependencies" -- for compatibility with the old mkDependHS, we accept options of the form -- -optdep-f -optdep.depend, etc. -dep_opts = [ - ( "s", SepArg (add v_Dep_suffixes) ), - ( "f", SepArg (writeIORef v_Dep_makefile) ), - ( "w", NoArg (writeIORef v_Dep_warnings False) ), - ( "-include-prelude", NoArg (writeIORef v_Dep_include_prelude True) ) --- ( "-exclude-module=", Prefix (add v_Dep_exclude_mods) ) --- ( "x", Prefix (add v_Dep_exclude_mods) ) - ] +dep_opts = + [ ( "s", SepArg (add v_Dep_suffixes) ) + , ( "f", SepArg (writeIORef v_Dep_makefile) ) + , ( "w", NoArg (writeIORef v_Dep_warnings False) ) + , ( "-include-prelude", NoArg (writeIORef v_Dep_include_prelude True) ) + , ( "-exclude-module=", Prefix (add v_Dep_exclude_mods) ) + , ( "x", Prefix (add v_Dep_exclude_mods) ) + ] beginMkDependHS :: IO () beginMkDependHS = do @@ -169,7 +169,7 @@ findDependency is_source src imp = do if imp_mod `elem` excl_mods then return Nothing else do - r <- findModule imp + r <- findModuleDep imp is_source case r of Just (mod,loc) | isHomeModule mod || include_prelude