* Merged newxml into HEAD

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

1 files changed, 92 insertions, 11 deletions

diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 05fd9fe3a..e2e492719 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -1,17 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-system-automake" xreflabel="Automake">
-<title>Installing Automake-&automake-version;</title>
-<?dbhtml filename="automake.html" dir="chapter06"?>
+<title>Automake-&automake-version;</title>
+<?dbhtml filename="automake.html"?>
+
+<indexterm zone="ch-system-automake"><primary sortas="a-Automake">Automake</primary></indexterm>
 
 <para>The Automake package contains programs for generating Makefiles for use
 with Autoconf.</para>
 
-<screen>&buildtime; &automake-time;
-&diskspace; &automake-compsize;</screen>
+<screen>&buildtime; 0.2 SBU
+&diskspace; 6.8 MB</screen>
+
+<para>Automake installation depends on: Autoconf, Bash, Coreutils,
+Diffutils, Grep, M4, Make, Perl, Sed.</para>
 
-&aa-automake-down;
-&aa-automake-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Automake</title>
@@ -24,7 +31,7 @@ with Autoconf.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To have the results tested, issue:
+<para>To test the results, issue:
 <userinput>make check</userinput>. This takes a long time, about 5 SBUs.</para>
 
 <para>Install the package:</para>
@@ -33,8 +40,82 @@ with Autoconf.</para>
 
 </sect2>
 
-&aa-automake-shortdesc;
-&aa-automake-desc;
 
-</sect1>
+<sect2 id="contents-automake"><title>Contents of Automake</title>
+
+<para><emphasis>Installed programs</emphasis>: acinstall, aclocal,
+aclocal-1.8, automake, automake-1.8, compile, config.guess, config.sub,
+depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs, py-compile,
+symlink-tree, ylwrap</para>
+
+</sect2>
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-automake acinstall"><primary sortas="b-acinstall">acinstall</primary></indexterm>
+<para id="acinstall"><command>acinstall</command> is a script that installs
+aclocal-style M4 files.</para>
+
+<indexterm zone="ch-system-automake aclocal"><primary sortas="b-aclocal">aclocal</primary></indexterm>
+<para id="aclocal"><command>aclocal</command> generates <filename>aclocal.m4</filename>
+files based on the contents of <filename>configure.in</filename> files.</para>
+
+<indexterm zone="ch-system-automake automake"><primary sortas="b-automake">automake</primary></indexterm>
+<para id="automake"><command>automake</command> is a tool for automatically generating
+<filename>Makefile.in</filename>'s from files called
+<filename>Makefile.am</filename>. To create all the
+<filename>Makefile.in</filename> files for a package, run this program in the
+top-level directory. By scanning the <filename>configure.in</filename>s it
+automatically finds each appropriate <filename>Makefile.am</filename> and
+generate the corresponding <filename>Makefile.in</filename>.</para>
+
+<indexterm zone="ch-system-automake compile"><primary sortas="b-compile">compile</primary></indexterm>
+<para id="compile"><command>compile</command> is a wrapper for compilers.</para>
+
+<indexterm zone="ch-system-automake config.guess"><primary sortas="b-config.guess">config.guess</primary></indexterm>
+<para id="config.guess"><command>config.guess</command> is a script that attempts to guess
+the canonical triplet for the given build, host, or target architecture.</para>
+
+<indexterm zone="ch-system-automake config.su"><primary sortas="b-config.su">config.su</primary></indexterm>
+<para id="config.su"><command>config.sub</command> is a configuration validation
+subroutine script.</para>
+
+<indexterm zone="ch-system-automake depcomp"><primary sortas="b-depcomp">depcomp</primary></indexterm>
+<para id="depcomp"><command>depcomp</command> is a script for compiling a program
+so that not only the desired output is generated, but also dependency
+information.</para>
 
+<indexterm zone="ch-system-automake elisp-comp"><primary sortas="b-elisp-comp">elisp-comp</primary></indexterm>
+<para id="elisp-comp"><command>elisp-comp</command> byte-compiles Emacs Lisp code.</para>
+
+<indexterm zone="ch-system-automake install-sh"><primary sortas="b-install-sh">install-sh</primary></indexterm>
+<para id="install-sh"><command>install-sh</command> is a script that installs a program,
+a script, or a datafile.</para>
+
+<indexterm zone="ch-system-automake mdate-sh"><primary sortas="b-mdate-sh">mdate-sh</primary></indexterm>
+<para id="mdate-sh"><command>mdate-sh</command> is a script that prints the modification
+time of a file or directory.</para>
+
+<indexterm zone="ch-system-automake missing"><primary sortas="b-missing">missing</primary></indexterm>
+<para id="missing"><command>missing</command> is a script acting as a common stub for
+missing GNU programs during an installation.</para>
+
+<indexterm zone="ch-system-automake mkinstalldirs"><primary sortas="b-mkinstalldirs">mkinstalldirs</primary></indexterm>
+<para id="mkinstalldirs"><command>mkinstalldirs</command> is a script that creates a directory
+tree.</para>
+
+<indexterm zone="ch-system-automake py-compile"><primary sortas="b-py-compile">py-compile</primary></indexterm>
+<para id="py-compile"><command>py-compile</command> compiles a Python program.</para>
+
+<indexterm zone="ch-system-automake symlink-tree"><primary sortas="b-symlink-tree">symlink-tree</primary></indexterm>
+<para id="symlink-tree"><command>symlink-tree</command> is a script to create a symlink tree of
+a directory tree.</para>
+
+<indexterm zone="ch-system-automake ylwrap"><primary sortas="b-ylwrap">ylwrap</primary></indexterm>
+<para id="ylwrap"><command>ylwrap</command> is a wrapper for lex and yacc.</para>
+
+</sect2>
+
+
+
+</sect1>