From 65498331d574565423a9f3f9db58e81aca16674c Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 27 Mar 2005 15:33:50 +0000
Subject: [PATCH] Updated build entities and added indexing tags to GLib and
 Doxygen

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3591 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent              |  2 +-
 general/genlib/glib.xml  | 56 ++++++++++++++++++++++++++++++----------
 general/prog/doxygen.xml | 13 ++++++----
 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/general.ent b/general.ent
index 63e615862c..4496eb8e04 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "26">
+<!ENTITY day          "27">
 <!ENTITY month        "03">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
diff --git a/general/genlib/glib.xml b/general/genlib/glib.xml
index 6a11b71cbf..dc2826adff 100644
--- a/general/genlib/glib.xml
+++ b/general/genlib/glib.xml
@@ -8,8 +8,8 @@
 <!ENTITY GLib-download-ftp "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-&GLib-version;.tar.gz">
 <!ENTITY GLib-md5sum "6fe30dad87c77b91b632def29dd69ef9">
 <!ENTITY GLib-size "412 KB">
-<!ENTITY GLib-buildsize "7 MB">
-<!ENTITY GLib-time "0.26 SBU">
+<!ENTITY GLib-buildsize "6.4 MB">
+<!ENTITY GLib-time "0.19 SBU">
 ]>
 
 <sect1 id="GLib" xreflabel="GLib-&GLib-version;">
@@ -19,6 +19,8 @@
 </sect1info>
 <?dbhtml filename="glib.html"?>
 <title>GLib-&GLib-version;</title>
+<indexterm zone="GLib">
+<primary sortas="a-GLib-1">GLib-1</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>GLib</application></title>
@@ -44,8 +46,7 @@ loop, threads, dynamic loading, and an object system.</para>
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch (when using 
-<application>GCC</application>-3.4.x): <ulink
+<listitem><para>Required Patch: <ulink 
 url="&patch-root;/glib-&GLib-version;-gcc34-1.patch"/></para></listitem>
 </itemizedlist></sect3>
 
@@ -59,8 +60,11 @@ commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../glib-&GLib-version;-gcc34-1.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 chmod -v 755 /usr/lib/libgmodule-1.2.so.0.0.10</command></userinput></screen>
 
 </sect2>
@@ -68,17 +72,41 @@ chmod -v 755 /usr/lib/libgmodule-1.2.so.0.0.10</command></userinput></screen>
 <sect2>
 <title>Contents</title>
 
-<para>The <application>glib</application> package contains 
-<filename>libglib-1.2</filename> libraries.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>glib-config</seg>
+<seg>libglib.[so,a], libgmodule.[so,a] and libgthread.[so,a]</seg>
+<seg>/usr/include/glib-1.2 and /usr/lib/glib</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>GLib libraries</title>
-<para><application>GLib</application> libraries contain a low-level core
-library for the <application><acronym>GIMP</acronym></application> 
-Toolkit.</para></sect3>
+<varlistentry id="glib-config">
+<term><command>glib-config</command></term>
+<listitem><para>is a tool that is used by <command>configure</command> scripts 
+to determine the compiler and linker flags that should be used to compile and 
+link programs that use <application>GLib</application>.</para>
+<indexterm zone="GLib glib-config">
+<primary sortas="b-glib-config">glib-config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libglib">
+<term><filename class='libraryfile'>libglib.[so,a]</filename></term>
+<listitem><para>libraries contain a low-level core library for the 
+<application><acronym>GIMP</acronym></application> Toolkit.</para>
+<indexterm zone="GLib libglib">
+<primary sortas="c-libglib">libglib.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
diff --git a/general/prog/doxygen.xml b/general/prog/doxygen.xml
index a89801e40f..cd7db1a7b7 100644
--- a/general/prog/doxygen.xml
+++ b/general/prog/doxygen.xml
@@ -8,8 +8,8 @@
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/users/dimitri/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-md5sum        "b0ea863bb3ccc757264f784a36519ddb">
   <!ENTITY doxygen-size          "2.7 MB">
-  <!ENTITY doxygen-buildsize     "48.2 MB">
-  <!ENTITY doxygen-time          "1.77 SBU (includes building documentation)">
+  <!ENTITY doxygen-buildsize     "39.7 MB (additional 8.5 MB to build and install docs and <command>doxywizard</command>)">
+  <!ENTITY doxygen-time          "1.26 SBU (additional 0.50 SBU to build docs and <command>doxywizard</command>)">
 ]>
 
 <sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
@@ -89,10 +89,10 @@ following commands for the <command>make install</command> command above:</para>
 
 <screen><userinput role='root'><command>make docs &amp;&amp;
 make pdf &amp;&amp;
-install -d -m755 /usr/share/doc/doxygen/src &amp;&amp;
-install -m644 src/translator{,_adapter,_en}.h \
+install -v -d -m755 /usr/share/doc/doxygen/src &amp;&amp;
+install -v -m644 src/translator{,_adapter,_en}.h \
     /usr/share/doc/doxygen/src &amp;&amp;
-install -m644 VERSION /usr/share/doc/doxygen &amp;&amp;
+install -v -m644 VERSION /usr/share/doc/doxygen &amp;&amp;
 make install_docs</command></userinput></screen>
 
 </sect2>
@@ -133,9 +133,12 @@ and documentation.</para>
 
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directory</segtitle>
+
 <seglistitem>
 <seg>doxygen, doxytag and doxywizard</seg>
+<seg>None</seg>
 <seg>/usr/share/doc/doxygen</seg>
 </seglistitem>
 </segmentedlist>