HEAD: Retaged the SBUs/disk-usage sections, the lists of options and the contents sections in chapter05.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3600 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 36 insertions, 18 deletions

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index e6a41f35e..21f71878e 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gcc-pass1">
+<sect1 id="ch-tools-gcc-pass1" role="wrap">
 <title>GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-GCC">GCC</primary>
 <secondary>tools, pass 1</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 4.4 SBU
-&diskspace; 300 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>4.4 SBU</seg><seg>300 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of GCC</title>
 
 <para>Unpack only the GCC-core tarball, as we won't be needing the C++ compiler
@@ -45,14 +50,18 @@ cd ../gcc-build</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
-purpose of this switch is to remove <filename>/usr/local/include</filename>
+<variablelist>
+<varlistentry>
+<term><userinput>--with-local-prefix=/tools</userinput></term>
+<listitem><para>The purpose of this switch is to remove <filename>/usr/local/include</filename>
 from <command>gcc</command>'s include search path. This is not absolutely
 essential; however, we want to try to minimize the influence of the host
 system, so this a sensible thing to do.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-shared</userinput>: This switch may
+<varlistentry>
+<term><userinput>--enable-shared</userinput></term>
+<listitem><para>This switch may
 seem counter-intuitive at first. But using it allows the building of
 <filename>libgcc_s.so.1</filename> and <filename>libgcc_eh.a</filename>, and
 having <filename>libgcc_eh.a</filename> available ensures that the configure
@@ -60,11 +69,15 @@ script for Glibc (the next package we compile) produces the proper results.
 Note that the <command>gcc</command> binaries will still be linked
 statically, as this is controlled by the <emphasis>-static</emphasis>
 value of BOOT_LDFLAGS in the next step.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-languages=c</userinput>: This option
+<varlistentry>
+<term><userinput>--enable-languages=c</userinput></term>
+<listitem><para>This option
 ensures that only the C compiler is built. The option is only needed when you
 have downloaded and unpacked the full GCC tarball.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Continue with compiling the package:</para>
 
@@ -72,17 +85,22 @@ have downloaded and unpacked the full GCC tarball.</para></listitem>
 
 <para>The meaning of the make parameters:</para>
 
-<itemizedlist>
-<listitem><para><userinput>BOOT_LDFLAGS="-static"</userinput>: This tells
-GCC to link its programs statically.</para></listitem>
+<variablelist>
+<varlistentry>
+<term><userinput>BOOT_LDFLAGS="-static"</userinput></term>
+<listitem><para>This tells GCC to link its programs statically.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>bootstrap</userinput>: This target doesn't just
+<varlistentry>
+<term><userinput>bootstrap</userinput></term>
+<listitem><para>This target doesn't just
 compile GCC, but compiles it several times. It uses the programs compiled in
 a first round to compile itself a second time, and then again a third time.
 It then compares these second and third compiles to make sure it can
 reproduce itself flawlessly, which most probably means that it was
 compiled correctly.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compilation is now complete, and at this point we would normally run the
 test suite. But, as mentioned before, the test suite framework is not in place
@@ -104,7 +122,7 @@ C compiler to install, as long as there's a symlink pointing to it:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gcc"/>.</para>
 </sect2>