From: simonpj <unknown>
Date: Tue, 22 Feb 2005 16:29:42 +0000 (+0000)
Subject: [project @ 2005-02-22 16:29:41 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~1040
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=fed0cc3f79f40987204258b9b62997a19e4d1afa

[project @ 2005-02-22 16:29:41 by simonpj]
-------------------------------------------------------
	Change -include-prelude to -include-pkg-deps for ghc -M
	-------------------------------------------------------

	Merge to STABLE

This commit just renames the flag for ghc -M to something more
sensible.
---

diff --git a/ghc/compiler/main/DriverMkDepend.hs b/ghc/compiler/main/DriverMkDepend.hs
index bb00efe..a4c0233 100644
--- a/ghc/compiler/main/DriverMkDepend.hs
+++ b/ghc/compiler/main/DriverMkDepend.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverMkDepend.hs,v 1.41 2005/02/15 11:24:51 simonmar Exp $
+-- $Id: DriverMkDepend.hs,v 1.42 2005/02/22 16:29:42 simonpj Exp $
 --
 -- GHC Driver
 --
@@ -323,6 +323,7 @@ dep_opts =
    , (  "f", 			SepArg (writeIORef v_Dep_makefile) )
    , (  "w", 			NoArg (writeIORef v_Dep_warnings False) )
    , (  "-include-prelude",  	NoArg (writeIORef v_Dep_include_pkg_deps True) )
+   , (  "-include-pkg-deps",  	NoArg (writeIORef v_Dep_include_pkg_deps True) )
    , (  "-exclude-module=",     Prefix (add v_Dep_exclude_mods . mkModule) )
    , (  "x",                    Prefix (add v_Dep_exclude_mods . mkModule) )
    ]
diff --git a/ghc/docs/users_guide/separate_compilation.xml b/ghc/docs/users_guide/separate_compilation.xml
index deba2cf..2d28160 100644
--- a/ghc/docs/users_guide/separate_compilation.xml
+++ b/ghc/docs/users_guide/separate_compilation.xml
@@ -922,7 +922,7 @@ M.o : X.hi-boot
 	locate any imported modules that come from packages.  The
 	package modules won't be included in the dependencies
 	generated, though (but see the
-	<option>&ndash;&ndash;include-prelude</option> option below).</para>
+	<option>&ndash;&ndash;include-pkg-deps</option> option below).</para>
 
 	<para>The dependency generation phase of GHC can take some
         additional options, which you may find useful.  For historical
@@ -1044,12 +1044,16 @@ ghc -M -optdep-f -optdep.depend ...
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term><option>&ndash;&ndash;include-prelude</option></term>
+	    <term><option>&ndash;&ndash;include-pkg-deps</option></term>
 	    <listitem>
 	      <para>Regard modules imported from packages as unstable,
-              i.e., generate dependencies on the package modules used
+              i.e., generate dependencies on any imported package modules
               (including <literal>Prelude</literal>, and all other
-              standard Haskell libraries).  This option is normally
+              standard Haskell libraries).  Dependencies are not traced
+	      recursively into packages; dependencies are only generated for
+	      home-package modules on external-package modules directly imported
+	      by the home package module.
+	      This option is normally
               only used by the various system libraries.</para>
 	    </listitem>
 	  </varlistentry>