[project @ 2000-07-14 09:03:57 by simonmar]
[ghc-hetmet.git] / ghc / docs / users_guide / using.sgml
index 5c42c41..0024c21 100644 (file)
@@ -358,13 +358,79 @@ standard <Filename>.hi</Filename>/<Filename>.o</Filename> suffixes; add <Option>
 <Command>make</Command> rule for GHC compiling&hellip;
 </Para>
 
-<Para>
-FURTHER EXOTICA: If you are doing a normal <Filename>.hs</Filename>-to-<Filename>.o</Filename> compilation
-but would like to hang onto the intermediate <Filename>.hc</Filename> C file, just
-throw in a <Option>-keep-hc-file-too</Option> option<IndexTerm><Primary>-keep-hc-file-too option</Primary></IndexTerm>.
-If you would like to look at the assembler output, toss in a
-<Option>-keep-s-file-too</Option>,<IndexTerm><Primary>-keep-s-file-too option</Primary></IndexTerm> too.
-</Para>
+    <sect2 id="keeping-intermediates">
+      <title>Keeping Intermediate Files</title>
+      <indexterm><primary>intermediate files, saving</primary>
+      </indexterm>
+      <indexterm><primary><literal>.hc</literal> files, saving</primary>
+      </indexterm>
+      <indexterm><primary><literal>.s</literal> files, saving</primary>
+      </indexterm>
+
+      <para>The following options are useful for keeping certain
+      intermediate files around, when normally GHC would throw these
+      away after compilation:</para>
+
+      <variablelist>
+       <varlistentry>
+         <term><literal>-keep-hc-files</literal></term>
+         <indexterm>
+           <primary><literal>-keep-hc-files</literal></primary>
+         </indexterm>
+         <listitem>
+           <para>Keep intermediate <literal>.hc</literal> files when
+           doing <literal>.hs</literal>-to-<literal>.o</literal>
+           compilations via C (NOTE: <literal>.hc</literal> files
+           aren't generated when using the native code generator, you
+           may need to use <literal>-fvia-C</literal> to force them
+           to be produced).</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>-keep-s-files</literal></term>
+         <indexterm>
+           <primary><literal>-keep-s-files</literal></primary>
+         </indexterm>
+         <listitem>
+           <para>Keep intermediate <literal>.s</literal> files.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>-keep-raw-s-files</literal></term>
+         <indexterm>
+           <primary><literal>-keep-raw-s-files</literal></primary>
+         </indexterm>
+         <listitem>
+           <para>Keep intermediate <literal>.raw-s</literal> files.
+           These are the direct output from the C compiler, before
+           GHC does &ldquo;assembly mangling&rdquo; to produce the
+           <literal>.s</literal> file.  Again, these are not produced
+           when using the native code generator.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>-keep-tmp-files</literal></term>
+         <indexterm>
+           <primary><literal>-keep-tmp-files</literal></primary>
+         </indexterm>
+         <indexterm>
+           <primary>temporary files<primary>
+           <secondary>keeping</secondary>
+         </indexterm>
+         <listitem>
+           <para>Instructs the GHC driver not to delete any of its
+           temporary files, which it normally keeps in
+           <literal>/tmp</literal> (or possibly elsewhere; see <xref
+           linkend="temp-files">).  Running GHC with
+           <literal>-v</literal> will show you what temporary files
+           were generated along the way.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+    </sect2>
 
 <Sect2 id="saving-ghc-stderr">
 <Title>Saving GHC's standard error output
@@ -387,23 +453,27 @@ output to a particular log file with a <Option>-odump &lt;blah&gt;</Option><Inde
 <Title>Redirecting temporary files
 </Title>
 
-<Para>
-<IndexTerm><Primary>temporary files, redirecting</Primary></IndexTerm>
-</Para>
+      <indexterm>
+       <primary>temporary files</primary>
+       <secondary>redirecting</secondary>
+      </indexterm>
 
 <Para>
-If you have trouble because of running out of space in <Filename>/tmp</Filename> (or
-wherever your installation thinks temporary files should go), you may
-use the <Option>-tmpdir &lt;dir&gt;</Option><IndexTerm><Primary>-tmpdir &lt;dir&gt; option</Primary></IndexTerm> option
-to specify an alternate directory.  For example, <Option>-tmpdir .</Option> says to
-put temporary files in the current working directory.
+If you have trouble because of running out of space in
+<Filename>/tmp</Filename> (or wherever your installation thinks
+temporary files should go), you may use the <Option>-tmpdir
+&lt;dir&gt;</Option><IndexTerm><Primary>-tmpdir &lt;dir&gt;
+option</Primary></IndexTerm> option to specify an alternate directory.
+For example, <Option>-tmpdir .</Option> says to put temporary files in
+the current working directory.
 </Para>
 
 <Para>
-Alternatively, use your <Constant>TMPDIR</Constant> environment variable.<IndexTerm><Primary>TMPDIR
-environment variable</Primary></IndexTerm> Set it to the name of the directory where
-temporary files should be put.  GCC and other programs will honour the
-<Constant>TMPDIR</Constant> variable as well.
+Alternatively, use your <Constant>TMPDIR</Constant> environment
+variable.<IndexTerm><Primary>TMPDIR environment
+variable</Primary></IndexTerm> Set it to the name of the directory
+where temporary files should be put.  GCC and other programs will
+honour the <Constant>TMPDIR</Constant> variable as well.
 </Para>
 
 <Para>
@@ -827,20 +897,6 @@ country.
 </VarListEntry>
 
 <VarListEntry>
-<Term><Option>-syslib &lt;lib&gt;</Option></Term>
-<ListItem>
-<Para>
-<IndexTerm><Primary>-syslib &lt;lib&gt; option</Primary></IndexTerm>
-If you are using a system-supplied non-Prelude library (e.g., the
-POSIX library), just use a <Option>-syslib posix</Option> option (for
-example).  The right interface files should then be available.  The
-accompanying HsLibs document lists the libraries available by this
-mechanism.
-</Para>
-</ListItem>
-</VarListEntry>
-
-<VarListEntry>
 <Term><Option>-I&lt;dir&gt;</Option></Term>
 <ListItem>
 <Para>
@@ -991,67 +1047,6 @@ Patrick Sansom had a workshop paper about how all this is done (though
 the details have changed quite a bit). <ULink URL="mailto:sansom@dcs.gla.ac.uk">Ask him</ULink> if you want a copy.
 </Para>
 
-<Sect3 id="packages">
-<Title>Packages</Title>
-
-<Para>
-<IndexTerm><Primary>packages</Primary></IndexTerm>
-To simplify organisation and compilation, GHC keeps libraries in <Emphasis>packages</Emphasis>. Packages are also compiled into single libraries on Unix, and DLLs on Windows. The term ``package'' can be used pretty much synonymously with ``library'', except that an application also forms a package, the Main package.
-</Para>
-
-<ItemizedList>
-<ListItem>
-<Para>
-A package is a group of modules. It may span many directories, or many packages may exist in a single directory. Packages may not be mutually recursive.
-</Para>
-</ListItem>
-
-<ListItem>
-<Para>
-A package has a name (e.g. <Filename>std</Filename>)
-</Para>
-</ListItem>
-
-<ListItem>
-<Para>
-Each package is built into a single library (Unix; e.g. <Filename>libHSfoo.a</Filename>), or a single DLL (Windows; e.g. <Filename>HSfoo.dll</Filename>)
-</Para>
-</ListItem>
-
-<ListItem>
-<Para>
-The <Option>-package-name foo</Option> flag tells GHC that the module being compiled is destined for package <Filename>foo</Filename>. If this is omitted, the default package, <Filename>Main</Filename>, is assumed.
-</Para>
-</ListItem>
-
-<ListItem>
-<Para>
-The <Option>-package foo</Option> flag tells GHC to make available modules 
-from package <Filename>foo</Filename>.  It replaces <Option>-syslib foo</Option>, which is now deprecated.
-</Para>
-</ListItem>
-
-<ListItem>
-<Para>
-GHC does not maintain detailed cross-package dependency information.
-It does remember which modules in other packages the current module
-depends on, but not which things within those imported things.
-</Para>
-</ListItem>
-</ItemizedList>
-
-<Para>
-All of this tidies up the Prelude enormously.  The Prelude and
-Standard Libraries are built into a single package called <Filename>std</Filename>.  (This
-is a change; the library is now called <Filename>libHSstd.a</Filename> instead of <Filename>libHS.a</Filename>).
-</Para>
-
-<Para>
-It is worth noting that on Windows, because each package is built as a DLL, and a reference to a DLL costs an extra indirection, intra-package references are cheaper than inter-package references. Of course, this applies to the <Filename>Main</Filename> package as well. This is not normally the case on most Unices.
-</Para>
-
-</Sect3>
-
 </Sect2>
 
 
@@ -1064,8 +1059,7 @@ It is worth noting that on Windows, because each package is built as a DLL, and
 </Para>
 
 <Para>
-It is reasonably straightforward to set up a <Filename>Makefile</Filename> to use with
-GHC, assuming you name your source files the same as your modules.
+It is reasonably straightforward to set up a <Filename>Makefile</Filename> to use with GHC, assuming you name your source files the same as your modules.
 Thus:
 </Para>
 
@@ -1078,7 +1072,7 @@ HC_OPTS = -cpp $(EXTRA_HC_OPTS)
 SRCS = Main.lhs Foo.lhs Bar.lhs
 OBJS = Main.o   Foo.o   Bar.o
 
-.SUFFIXES : .o .hi .lhs .hc .s
+.SUFFIXES : .o .hs .hi .lhs .hc .s
 
 cool_pgm : $(OBJS)
         rm $@
@@ -1147,65 +1141,201 @@ a rule to do so; one of the preceding suffix rules does the job
 nicely.
 </Para>
 
-<Para>
-Putting inter-dependencies of the form <Literal>Foo.o : Bar.hi</Literal> into your
-<Filename>Makefile</Filename> by hand is rather error-prone.  Don't worry&mdash;never fear,
-<Command>mkdependHS</Command> is here! (and is distributed as part of GHC) Add the
-following to your <Filename>Makefile</Filename>:
-</Para>
+    </sect2>
 
-<Para>
+    <sect2 id="sec-makefile-dependencies">
+      <title>Dependency generation</title>
+      <indexterm><primary>dependencies in Makefiles</primary></indexterm>
+      <indexterm><primary>Makefile dependencies</primary></indexterm>
+
+      <para>Putting inter-dependencies of the form <Literal>Foo.o :
+      Bar.hi</Literal> into your <Filename>Makefile</Filename> by hand
+      is rather error-prone.  Don't worry, GHC has support for
+      automatically generating the required dependencies.  Add the
+      following to your <Filename>Makefile</Filename>:</para>
 
 <ProgramListing>
 depend :
-        mkdependHS -- $(HC_OPTS) -- $(SRCS)
+        ghc -M $(HC_OPTS) $(SRCS)
 </ProgramListing>
 
-</Para>
-
-<Para>
-Now, before you start compiling, and any time you change the <Literal>imports</Literal>
-in your program, do <Command>make depend</Command> before you do <Command>make cool&lowbar;pgm</Command>.
-<Command>mkdependHS</Command> will append the needed dependencies to your <Filename>Makefile</Filename>.
-<Command>mkdependHS</Command> is fully described in <XRef LinkEnd="mkdependHS">.
-</Para>
-
-<Para>
-A few caveats about this simple scheme:
-</Para>
-
-<Para>
-
-<ItemizedList>
-<ListItem>
-
-<Para>
- You may need to compile some modules explicitly to create their
-interfaces in the first place (e.g., <Command>make Bar.o</Command> to create <Filename>Bar.hi</Filename>).
-
-</Para>
-</ListItem>
-<ListItem>
-
-<Para>
- You may have to type <Command>make</Command> more than once for the dependencies
-to have full effect.  However, a <Command>make</Command> run that does nothing
-<Emphasis>does</Emphasis> mean &ldquo;everything's up-to-date.&rdquo;
-
-</Para>
-</ListItem>
-<ListItem>
-
-<Para>
- This scheme will work with mutually-recursive modules but,
-again, it may take multiple iterations to &ldquo;settle.&rdquo;
-
-</Para>
-</ListItem>
-
-</ItemizedList>
-
-</Para>
+      <para>Now, before you start compiling, and any time you change
+      the <Literal>imports</Literal> in your program, do <Command>make
+      depend</Command> before you do <Command>make
+      cool&lowbar;pgm</Command>.  <Command>ghc -M</Command> will append
+      the needed dependencies to your
+      <Filename>Makefile</Filename>.</Para>
+
+      <para>In general, if module <Literal>A</Literal> contains the
+      line
+
+<programlisting>
+import B ...blah...
+</programlisting>
+
+       then <command>ghc -M</command> will generate a dependency
+       line of the form:
+
+<programlisting>
+A.o : B.hi
+</programlisting>
+
+       If module <literal>A</literal> contains the line 
+
+<programlisting>
+import {-# SOURCE #-} B ...blah...
+</programlisting>
+
+       then <command>ghc -M</command> will generate a dependency
+       line of the form:
+
+<programlisting>
+A.o : B.hi-boot
+</programlisting>
+
+       (See <xref linkend="hi-files"> for details of interface files.)
+       If <literal>A</literal> imports multiple modules, then there
+       will be multiple lines with <filename>A.o</filename> as the
+       target.</para>
+
+      <para>By default, <Command>ghc -M</Command> generates all the
+      dependencies, and then concatenates them onto the end of
+      <Filename>makefile</Filename> (or <Filename>Makefile</Filename>
+      if <Filename>makefile</Filename> doesn't exist) bracketed by the
+      lines "<Literal>&num; DO NOT DELETE: Beginning of Haskell
+      dependencies</Literal>" and "<Literal>&num; DO NOT DELETE: End
+      of Haskell dependencies</Literal>".  If these lines already
+      exist in the <Filename>makefile</Filename>, then the old
+      dependencies are deleted first.</para>
+
+      <para>Internally, GHC uses a script to generate the
+      dependencies, called <command>mkdependHS</command>.  This script
+      has some options of its own, which you might find useful.
+      Options can be passed directly to <command>mkdependHS</command>
+      with GHC's <literal>-optdep</literal> option.  For example, to
+      generate the dependencies into a file called
+      <literal>.depend</literal> instead of
+      <literal>Makefile</literal>:</para>
+
+<screen>
+ghc -M -optdep-f optdep.depend ...
+</screen>
+      
+      <para>The full list of options accepted by
+      <command>mkdependHS</command> is:</para>
+
+      <variablelist>
+
+       <varlistentry>
+         <term><option>-w</option></term>
+         <listitem>
+           <para>Turn off warnings about interface file shadowing.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>-f blah</option></term>
+         <listitem>
+           <para>Use <Filename>blah</Filename> as the makefile,
+            rather than <Filename>makefile</Filename> or
+            <Filename>Makefile</Filename>.  If
+            <Filename>blah</Filename> doesn't exist,
+            <Command>mkdependHS</Command> creates it.  We often use
+            <Option>-f .depend</Option> to put the dependencies in
+            <Filename>.depend</Filename> and then
+            <Command>include</Command> the file
+            <Filename>.depend</Filename> into
+            <Filename>Makefile</Filename>.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>-o &lt;osuf&gt;</option></term>
+         <listitem>
+           <para>Use <Filename>.&lt;osuf&gt;</Filename> as the
+            "target file" suffix ( default: <Literal>o</Literal>).
+            Multiple <Option>-o</Option> flags are permitted (GHC2.05
+            onwards).  Thus "<Option>-o hc -o o</Option>" will
+            generate dependencies for <Filename>.hc</Filename> and
+            <Filename>.o</Filename> files.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>-s &lt;suf&gt;</option></term>
+         <listitem>
+           <para>Make extra dependencies that declare that files with
+            suffix
+            <Filename>.&lt;suf&gt;&lowbar;&lt;osuf&gt;</Filename>
+            depend on interface files with suffix
+            <Filename>.&lt;suf&gt;&lowbar;hi</Filename>, or (for
+            <Literal>&lcub;-&num; SOURCE &num;-&rcub;</Literal>
+            imports) on <Filename>.hi-boot</Filename>.  Multiple
+            <Option>-s</Option> flags are permitted.  For example,
+            <Option>-o hc -s a -s b</Option> will make dependencies
+            for <Filename>.hc</Filename> on <Filename>.hi</Filename>,
+            <Filename>.a&lowbar;hc</Filename> on
+            <Filename>.a&lowbar;hi</Filename>, and
+            <Filename>.b&lowbar;hc</Filename> on
+            <Filename>.b&lowbar;hi</Filename>.  (Useful in conjunction
+            with NoFib "ways".)</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>--exclude-module=&lt;file&gt;</option></term>
+         <listitem>
+           <para>Regard <Filename>&lt;file&gt;</Filename> as
+            "stable"; i.e., exclude it from having dependencies on
+            it.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>-x</option></term>
+         <listitem>
+           <para>same as <option>--exclude-module</option></para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>--exclude-directory=&lt;dirs&gt;</option></term>
+         <listitem>
+           <para>Regard the colon-separated list of directories
+            <Filename>&lt;dirs&gt;</Filename> as containing stable,
+            don't generate any dependencies on modules therein.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>-xdirs</option></term>
+         <listitem>
+           <para>same as <Option>--exclude-directory</Option>.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>--include-module=&lt;file&gt;</option></term>
+         <listitem>
+           <para>Regard <Filename>&lt;file&gt;</Filename> as not
+            "stable"; i.e., generate dependencies on it (if any). This
+            option is normally used in conjunction with the
+            <Option>--exclude-directory</Option> option.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>--include-prelude</option></term>
+         <listitem>
+           <para>Regard prelude libraries as unstable, i.e., generate
+            dependencies on the prelude modules used (including
+            <Literal>Prelude</Literal>).  This option is normally only
+            used by the various system libraries. If a
+            <Option>-package</Option> option is used, dependencies will
+            also be generated on the library's interfaces.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
 
 </Sect2>
 
@@ -1349,6 +1479,328 @@ construction of interface files, is (allegedly) in the works.
 
 </Sect1>
 
+  <sect1 id="packages">
+    <title>Packages</title>
+    <indexterm><primary>packages</primary></indexterm>
+
+    <para>Packages are collections of libraries, conveniently grouped
+    together as a single entity.  The package system is flexible: a
+    package may consist of Haskell code, foreign language code (eg. C
+    libraries), or a mixture of the two.  A package is a good way to
+    group together related Haskell modules, and is essential if you
+    intend to make the modules into a Windows DLL (see below).</para>
+
+    <para>Because packages can contain both Haskell and C libraries, they
+    are also a good way to provide convenient access to a Haskell
+    layer over a C library.</para>
+
+    <para>GHC comes with several packages (see <xref
+    linkend="book-hslibs">), and packages can be added/removed from an
+    existing GHC installation.</para>
+
+    <sect2 id="listing-packages">
+      <title>Listing the available packages</title>
+      <indexterm><primary>packages</primary>
+       <secondary>listing</secondary></indexterm>
+
+      <para>To see what packages are currently installed, use the
+      <literal>--list-packages</literal> option:</para>
+      <indexterm><primary><literal>--list-packages</literal></primary>
+      </indexterm>
+
+<screen>
+  $ ghc --list-packages
+  gmp, rts, std, lang, concurrent, data, net, posix, text, util
+</screen>
+
+      <para>Note that your GHC installation might have a slightly
+      different set of packages installed.</para>
+
+      <para>The <literal>gmp</literal> and <literal>rts</literal>
+      packages are always present, and represent the multi-precision
+      integer and runtime system libraries respectively.  The
+      <literal>std</literal> package contains the Haskell prelude.
+      The rest of the packages are optional libraries.</para>
+
+    </sect2>
+
+    <sect2 id="using-packages">
+      <title>Using a package</title>
+      <indexterm><primary>packages</primary>
+       <secondary>using</secondary></indexterm>
+      
+      <para>To use a package, add the <literal>-package</literal> flag
+      to the command line:</para>
+
+      <variablelist>
+       <varlistentry>
+         <term><option>-package &lt;lib&gt;</option></term>
+         <indexterm><primary>-package &lt;lib&gt; option</primary></indexterm>
+         <listitem>
+           <para>This option brings into scope all the modules from
+           package <literal>&lt;lib&gt;</literal> (they still have to
+           be imported in your Haskell source, however).  It also
+           causes the relevant libraries to be linked when linking is
+           being done.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+
+      <para>Some packages depend on other packages, for example the
+      <literal>text</literal> package makes use of some of the modules
+      in the <literal>lang</literal> package.  The package system
+      takes care of all these dependencies, so that when you say
+      <literal>-package text</literal> on the command line, you
+      automatically get <literal>-package lang</literal> too.</para>
+    </sect2>
+
+    <sect2 id="building-packages">
+      <title>Building a package from Haskell source</title>
+      <indexterm><primary>packages</primary>
+       <secondary>building</secondary></indexterm>
+
+      <para>It takes some special considerations to build a new
+      package:</para>
+
+      <itemizedlist>
+       <listitem>
+         <para>A package may contain several Haskell modules. A
+          package may span many directories, or many packages may
+          exist in a single directory. Packages may not be mutually
+          recursive.</para>
+       </listitem>
+
+       <listitem>
+         <para>A package has a name
+         (e.g. <filename>std</filename>)</para>
+       </listitem>
+
+       <listitem>
+         <para>The Haskell code in a package may be built into one or
+         more Unix libraries (e.g. <Filename>libHSfoo.a</Filename>),
+         or a single DLL on Windows
+         (e.g. <Filename>HSfoo.dll</Filename>).  The restriction to a
+         single DLL on Windows is that the package system is used to
+         tell the compiler when it should make an inter-DLL call
+         rather than an intra-DLL call (inter-DLL calls require an
+         extra indirection).</para>
+       </listitem>
+
+       <listitem>
+         <para>GHC does not maintain detailed cross-package
+          dependency information.  It does remember which modules in
+          other packages the current module depends on, but not which
+          things within those imported things.</para>
+       </listitem>
+      </itemizedlist>
+
+      <para>To compile a module which is to be part of a new package,
+      use the <literal>-package-name</literal> option:</para>
+
+      <variablelist>
+       <varlistentry>
+         <term><option>-package-name &lt;foo&gt;</option></term>
+         <indexterm><primary><literal>-package-name</literal></primary>
+           <secondary>option</secondary></indexterm>
+         <listitem>
+           <para>This option is added to the command line when
+           compiling a module that is destined to be part of package
+           <literal>foo</literal>.  If this flag is omitted then the
+           default package <literal>Main</literal> is assumed.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+
+      <para>Failure to use the <literal>-package-name</literal> option
+      when compiling a package will result in disaster on Windows, but
+      is relatively harmless on Unix at the moment (it will just cause
+      a few extra dependencies in some interface files).  However,
+      bear in mind that we might add support for Unix shared libraries
+      at some point in the future.</para>
+
+      <para>It is worth noting that on Windows, because each package
+      is built as a DLL, and a reference to a DLL costs an extra
+      indirection, intra-package references are cheaper than
+      inter-package references. Of course, this applies to the
+      <Filename>Main</Filename> package as well.</para>
+
+    </sect2>
+    <sect2 id="package-management">
+      <title>Package management</title>
+      <indexterm><primary>packages</primary>
+       <secondary>management</secondary></indexterm>
+      
+      <para>GHC uses a package configuration file, called
+      <literal>packages.conf</literal>, which can be found in your GHC
+      install directory.  This file isn't intended to be edited
+      directly, instead GHC provides options for adding & removing
+      packages:</para>
+
+      <variablelist>
+       <varlistentry>
+         <term><option>--add-package</option></term>
+         <indexterm><primary><literal>--add-package</literal></primary>
+             <secondary>option</secondary></indexterm>
+         <listitem>
+           <para>Reads a package specification (see below) on stdin,
+           and adds it to the database of installed packages.  The
+           package specification must be a package that isn't already
+           installed.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><option>--delete-package &lt;foo&gt;</option></term>
+         <indexterm><primary><literal>--delete-package</literal></primary>
+             <secondary>option</secondary></indexterm>
+         <listitem>
+           <para>Removes the specified package from the installed
+           configuration.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+
+      <para>In both cases, the old package configuration file is saved
+      in <literal>packages.conf.old</literal> in your GHC install
+      directory, so in an emergency you can always copy this file into
+      <literal>package.conf</literal> to restore the old
+      settings.</para>
+
+      <para>A package specification looks like this:</para>
+
+<screen>
+ ("mypkg",
+  "4.08",
+  Package
+       {
+        import_dirs    =  ["/usr/local/lib/imports/mypkg"],
+       library_dirs   =  ["/usr/local/lib"],
+       libraries      =  ["HSmypkg", "HSmypkg_cbits"],
+       include_dirs   =  [],
+       c_includes     =  ["HsMyPkg.h"],
+       package_deps   =  ["text", "data"],
+       extra_ghc_opts =  [],
+       extra_cc_opts  =  [],
+       extra_ld_opts  =  ["-lmy_clib"]
+       }
+ )
+</screen>
+
+      <para>The first line is the name of the package, for use with
+      the <literal>-package</literal> flag and as listed in the
+      <literal>--list-packages</literal> list.  The second line is the
+      version of GHC that was used to compile any Haskell code in this
+      package (GHC will refuse to add the package if its version
+      number differs from this one).  The rest of the components of
+      the package specification may be specified in any order, and
+      are:</para>
+
+      <variablelist>
+       <varlistentry>
+         <term><literal>import_dirs</literal></term>
+         <indexterm><primary><literal>import_dirs</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of directories containing interface files
+           (<literal>.hi</literal> files) for this package.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>library_dirs</literal></term>
+         <indexterm><primary><literal>library_dirs</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of directories containing libraries for this
+           package.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>libraries</literal></term>
+         <indexterm><primary><literal>libraries</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of libraries for this package, with the
+           <literal>.a</literal> or <literal>.dll</literal> suffix
+           omitted.  On Unix, the <literal>lib</literal> prefix is
+           also omitted.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>include_dirs</literal></term>
+         <indexterm><primary><literal>include_dirs</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of directories containing C includes for this
+           package (maybe the empty list).</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>c_includes</literal></term>
+         <indexterm><primary><literal>c_includes</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of files to include for via-C compilations
+           using this package.  Typically this include file will
+           contain function prototypes for any C functions used in
+           the package, in case they end up being called as a result
+           of Haskell functions from the package being
+           inlined.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>package_deps</literal></term>
+         <indexterm><primary><literal>package_deps</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>A list of packages which this package depends
+           on.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>extra_ghc_opts</literal></term>
+         <indexterm><primary><literal>extra_ghc_opts</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>Extra arguments to be added to the GHC command line
+           when this package is being used.</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>extra_cc_opts</literal></term>
+         <indexterm><primary><literal>extra_cc_opts</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>Extra arguments to be added to the gcc command line
+           when this package is being used (only for via-C
+           compilations).</para>
+         </listitem>
+       </varlistentry>
+
+       <varlistentry>
+         <term><literal>extra_ld_opts</literal></term>
+         <indexterm><primary><literal>extra_ld_opts</literal></primary>
+           <secondary>package specification</secondary></indexterm>
+         <listitem>
+           <para>Extra arguments to be added to the gcc command line
+           (for linking) when this package is being used.</para>
+         </listitem>
+       </varlistentry>
+      </variablelist>
+
+      <para>For examples of more package specifications, take a look
+      at the <literal>package.conf</literal> in your GHC
+      installation.</para>
+    </sect2>
+  </sect1>
+
+
 <Sect1 id="options-optimise">
 <Title>Optimisation (code improvement)
 </Title>
@@ -1570,10 +2022,12 @@ Here are some &ldquo;dangerous&rdquo; optimisations you <Emphasis>might</Emphasi
 </Para>
 
 <Para>
-Compile via C, and don't use the native-code generator.  (There are
-many cases when GHC does this on its own.)  You might pick up a little
-bit of speed by compiling via C.  If you use <Function>&lowbar;ccall&lowbar;gc&lowbar;</Function>s or
-<Function>&lowbar;casm&lowbar;</Function>s, you probably <Emphasis>have</Emphasis> to use <Option>-fvia-C</Option>.
+Compile via C, and don't use the native-code generator.  (There are many
+cases when GHC does this on its own.) You might pick up a little bit of
+speed by compiling via C (e.g. for floating-point intensive code on Intel).
+If you use <Function>&lowbar;casm&lowbar;</Function>s (which are utterly
+deprecated), you probably <Emphasis>have</Emphasis> to use
+<Option>-fvia-C</Option>.
 </Para>
 
 <Para>
@@ -2068,7 +2522,7 @@ THIS MAY CHANGE.  Meanwhile, options so sent are:
 </Para>
 
 <Para>
-If you are compiling with lots of <Literal>ccalls</Literal>, etc., you may need to
+If you are compiling with lots of foreign calls, you may need to
 tell the C&nbsp;compiler about some <Literal>&num;include</Literal> files.  There is no real
 pretty way to do this, but you can use this hack from the
 command-line:
@@ -2173,15 +2627,15 @@ libraries automatically; these are:
 </ListItem>
 </VarListEntry>
 <VarListEntry>
-<Term><Option>-syslib &lt;name&gt;</Option>:</Term>
+<Term><Option>-package &lt;name&gt;</Option>:</Term>
 <ListItem>
 <Para>
-<IndexTerm><Primary>-syslib &lt;name&gt; option</Primary></IndexTerm>
+<IndexTerm><Primary>-package &lt;name&gt; option</Primary></IndexTerm>
 </Para>
 
 <Para>
 If you are using a Haskell &ldquo;system library&rdquo; (e.g., the POSIX
-library), just use the <Option>-syslib posix</Option> option, and the correct code
+library), just use the <Option>-package posix</Option> option, and the correct code
 should be linked in.
 </Para>
 </ListItem>
@@ -2254,7 +2708,7 @@ options the driver passes through to the linker.
 
 </Sect1>
 
-<Sect1>
+<Sect1 id="sec-using-concurrent">
 <Title>Using Concurrent Haskell</Title>
 
 <Para>
@@ -2266,7 +2720,7 @@ GHC (as of version 4.00) supports Concurrent Haskell by default,
 without requiring a special option or libraries compiled in a certain
 way.  To get access to the support libraries for Concurrent Haskell
 (i.e. <Literal>Concurrent</Literal> and friends), use the
-<Option>-syslib concurrent</Option> option.
+<Option>-package concurrent</Option> option.
 </Para>
 
 <Para>
@@ -2283,7 +2737,7 @@ LinkEnd="sec-Concurrent">.
 
 </Sect1>
 
-<Sect1>
+<Sect1 id="sec-using-parallel">
 <Title>Using Parallel Haskell</Title>
 
 <Para>
@@ -2593,3 +3047,10 @@ computation speed.
 &debug
 
 </Chapter>
+
+<!-- Emacs stuff:
+     ;;; Local Variables: ***
+     ;;; mode: sgml ***
+     ;;; sgml-parent-document: ("users_guide.sgml" "book" "chapter") ***
+     ;;; End: ***
+ -->