[xserver-commit] cygwin-x-doc/cg cygwin-x-cg.xml,NONE,1.1 Makefile.am,1.1.1.1,1.2 Makefile.in,1.2,1.3 cygwin-xfree-cg.xml,1.3,NONE

Harold L Hunt II xserver-commit@pdx.freedesktop.org 

Committed by: harold

Update of /cvs/xserver/cygwin-x-doc/cg
In directory pdx:/tmp/cvs-serv10011/cg

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	cygwin-x-cg.xml 
Removed Files:
	cygwin-xfree-cg.xml 
Log Message:
Fix problems with install target for documentation.  Final cleanups to allow the package to be distributed in binary form.

--- NEW FILE: cygwin-x-cg.xml ---
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [

<!-- Include the common entities -->
<!ENTITY % common SYSTEM "../common/entities.xml"> %common;

<!-- System entities -->
<!ENTITY overview SYSTEM "overview.xml">
<!ENTITY programming SYSTEM "programming.xml">
<!ENTITY programming-tree-layout SYSTEM
"programming-tree-layout.xml">
<!ENTITY programming-server-architecture SYSTEM
"programming-server-architecture.xml">
<!ENTITY programming-obtaining-source SYSTEM
"programming-obtaining-source.xml">
<!ENTITY programming-native SYSTEM "programming-native.xml">
<!ENTITY programming-cross SYSTEM "programming-cross.xml">
<!ENTITY programming-distribution SYSTEM "programming-distribution.xml">
<!ENTITY documentation SYSTEM "documentation.xml">
<!ENTITY documentation-obtaining-source SYSTEM
"documentation-obtaining-source.xml">
<!ENTITY documentation-docbook SYSTEM "documentation-docbook.xml">
<!ENTITY documentation-build SYSTEM "documentation-build.xml">
<!ENTITY documentation-distribution SYSTEM
"documentation-distribution.xml">
<!ENTITY website SYSTEM "website.xml">
<!ENTITY biblio SYSTEM "biblio.xml">
<!ENTITY glossary SYSTEM "glossary.xml">

<!-- Project entities -->
<!ENTITY project-path-devel "~/x-devel">
<!ENTITY project-path-xc "&project-path-devel;/xc">
<!ENTITY project-path-build "&project-path-devel;/build">
<!ENTITY project-path-build-std "&project-path-build;/std">
<!ENTITY project-path-build-debug "&project-path-build;/debug">
<!ENTITY project-path-stagingdir "/stagingdir">
<!ENTITY project-path-bindistdir "/bindistdir">
<!ENTITY project-path-commondistdir "/commondist">
<!ENTITY project-path-testdir "/testdir">
<!ENTITY project-url-lndir
"http://www.msu.edu/~huntharo/xwin/lndir.exe.bz2">

<!-- Programming title entities -->
<!ENTITY title-prog-tree-layout "Source Code Tree Layout">
<!ENTITY title-prog-server-architecture "&project; X Server
Architecture">
<!ENTITY title-prog-server-architecture-privates "Server Privates">
<!ENTITY title-prog-server-architecture-privates-structs "Structures">
<!ENTITY title-prog-server-architecture-privates-macros "Macros">
<!ENTITY title-prog-server-architecture-engines "Engine System">
<!ENTITY title-prog-server-architecture-engines-shadow "Shadow FB Engines">
<!ENTITY title-prog-server-architecture-engines-native "Native GDI
Engine">
<!ENTITY title-prog-server-architecture-engines-primary "Primary FB Engine">
<!ENTITY title-prog-server-architecture-input "User Input">
<!ENTITY title-prog-server-architecture-input-keyboard "Keyboard">
<!ENTITY title-prog-server-architecture-input-mouse "Mouse">
<!ENTITY title-prog-server-architecture-input-mouse-wheel "Wheel">
<!ENTITY title-prog-server-architecture-input-mouse-motion "Motion">
<!ENTITY title-prog-server-architecture-input-mouse-buttons "Buttons">
<!ENTITY title-prog-server-architecture-input-mouse-3be "Three Button
Emulation">
<!ENTITY title-prog-obtaining-source "Obtaining the Source Code">
<!ENTITY title-prog-build-native "Native Compiling">
<!ENTITY title-prog-build-cross "Cross Compiling">
<!ENTITY title-prog-cross-obtaining-compiler-source "Obtaining &binutils; and &gcc; Source">
<!ENTITY title-prog-cross-obtaining-cygwin-headers-and-libs "Obtaining &cygwin; Headers and Libs">
<!ENTITY title-prog-cross-building-binutils-and-gcc "Building &binutils; and &gcc;">
<!ENTITY title-prog-cross-tool-links "Creating Links for &binutils; and &gcc;">
<!ENTITY title-prog-cross-build "Building &project;">
<!ENTITY title-prog-distribution "Packaging a &project; Distribution">

<!-- Documentation title entities -->
<!ENTITY title-docs "Documentation">
<!ENTITY title-docs-obtaining-source "Obtaining the Source Code">
<!ENTITY title-docs-docbook "Setting Up a DocBook Build Environment">
<!ENTITY title-docs-build "Building the Documentation">
<!ENTITY title-docs-distribution "Packaging a Documentation
Distribution">

<!-- Website title entities -->
<!ENTITY title-web "Web Site Maintenance">

<!-- Cygnus entities -->
<!ENTITY file-cygwin-lib "cygwin-lib">
<!ENTITY file-cygwin-lib-arc "&file-cygwin-lib;&ext-tgz;">
<!ENTITY file-cygwin-lib-arc-size "16 MiB">

<!ENTITY file-cygwin-include "cygwin-include">
<!ENTITY file-cygwin-include-arc "&file-cygwin-include;&ext-tgz;">
<!ENTITY file-cygwin-include-arc-size "1.5 MiB">

<!-- Cross compiler entities -->
<!ENTITY path-cross-root "/home/my_login/cygwin">
<!ENTITY path-cross-src "&path-cross-root;/src/">
<!ENTITY dir-cross-src "src">
<!ENTITY cross-prefix "i686-pc-cygwin">
<!ENTITY file-cross-links-script "cross-links.sh">
<!ENTITY path-crosscompiledir "&path-cross-root;/&cross-prefix;/bin">
<!ENTITY path-cross-lib-and-include "&path-cross-root;/&cross-prefix;/">

<!ENTITY gcc "gcc">
<!ENTITY gcc-version "3.3.1-1">
<!ENTITY dir-gcc-src "gcc-&gcc-version;">
<!ENTITY path-download-gcc "gcc/">
<!ENTITY path-gcc-src "&path-cross-src;&dir-gcc-src;">
<!ENTITY file-gcc-src "gcc-&gcc-version;-src">
<!ENTITY file-gcc-src-tar "&file-gcc-src;&ext-tar;">
<!ENTITY file-gcc-src-arc "&file-gcc-src;&ext-zipped;">
<!ENTITY file-gcc-src-arc-size "21.9 MiB">

<!ENTITY binutils "binutils">
<!ENTITY binutils-version "20030901-1">
<!ENTITY dir-binutils-src "binutils-&binutils-version;">
<!ENTITY path-download-binutils "binutils/">
<!ENTITY path-binutils-src "&path-cross-src;&dir-binutils-src;">
<!ENTITY file-binutils-src "binutils-&binutils-version;-src">
<!ENTITY file-binutils-src-tar "&file-binutils-src;&ext-tar;">
<!ENTITY file-binutils-src-arc "&file-binutils-src;&ext-zipped;">
<!ENTITY file-binutils-src-arc-size "10.5 MiB">

<!ENTITY cross-bash-prompt-open "[harold@CrossHost">
<!ENTITY cross-bash-prompt-close "]$">

<!-- Project file names -->
<!ENTITY file-lndir "lndir.exe">
<!ENTITY file-lndir-size "8 KiB">
<!ENTITY file-cvs-update-log "cvs-update.log">
<!ENTITY file-documentation-source-version "0.9.6">
<!ENTITY file-documentation-source
"cygwin-xfree-doc-&file-documentation-source-version;">
<!ENTITY file-documentation-source-arc
"&file-documentation-source;&ext-tar-gz;">
<!ENTITY file-documentation-source-arc-size "272 KiB">
]>

<book id="cygwin-x-cg">

<bookinfo id="book-info">

<date>2001-05-22</date>

<title>&project; Contributor's Guide</title>

<author>
<firstname>Harold</firstname>
<othername role="mi">L</othername>
<surname>Hunt</surname>
<lineage>II</lineage>
</author>

<legalnotice id="legal-notice">
<blockquote id="legal-notice-quote"><para>
Copyright (c)  2001  Harold L Hunt II.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation;
with no Invariant Sections, with no
Front-Cover Texts, and with no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
</para></blockquote>
</legalnotice>

<revhistory id="revision-history">

<!-- Template -->

<!--

<revision>
<revnumber>0.6.</revnumber>
<date>2002-01-</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark></revremark>
</revision>

-->


<revision>
<revnumber>0.6.5</revnumber>
<date>2003-09-20</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Update cross compiling instructions.</revremark>
</revision>


<revision>
<revnumber>0.6.4</revnumber>
<date>2003-09-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Add expat and cygipc to required devel packages.</revremark>
</revision>


<revision>
<revnumber>0.6.3</revnumber>
<date>2003-07-26</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Update lndir build instructions and add required devel packages.</revremark>
</revision>


<revision>
<revnumber>0.6.2</revnumber>
<date>2003-01-01</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Update cross compiling section.</revremark>
</revision>


<revision>
<revnumber>0.6.1</revnumber>
<date>2002-05-16</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Update the version of the binutils package.</revremark>
</revision>


<revision>
<revnumber>0.6.0</revnumber>
<date>2002-01-07</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Add initial information to the Documentation
chapter.</revremark>
</revision>


<revision>
<revnumber>0.3.2</revnumber>
<date>2001-11-13</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Wrote two and a half pages in the Server Architecture -
User Input section.  Check and correct spelling.</revremark>
</revision>


<revision>
<revnumber>0.3.1</revnumber>
<date>2001-10-28</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Added and completed roughly 1/2 to 1/3 of a new Server
Architecture section.  Added and completed an initial version of a
Packing a &project; Distribution section; copied in part, and adapted
to &cygwin; from &xfree;'s CVS devel/bindist-notes.  Added a
bibliography entry for Definition of the Porting Layer.  Added several
glossary terms, bringing the total to twenty.</revremark>
</revision>


<revision>
<revnumber>0.3.0</revnumber>
<date>2001-10-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Bumped the revision number to 0.3.0 to indicate that
roughly 1/3 of the planned contents are present.</revremark>
</revision>


<revision>
<revnumber>0.0.6</revnumber>
<date>2001-07-17</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revdescription>
<itemizedlist>

<listitem>
<para>Programming: Add instructions for building &project; on the
cross compiling build system.</para>
</listitem>

<listitem>
<para>Move revision history from revremark tags to revdescription
tags.</para>
</listitem>

</itemizedlist>
</revdescription>

</revision>


<revision>
<revnumber>0.0.5</revnumber>
<date>2001-07-12</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revdescription>
<itemizedlist>

<listitem>
<para>Programming: Add instructions for setting up cross
compiling build system.</para>
</listitem>

</itemizedlist>
</revdescription>

</revision>


<revision>
<revnumber>0.0.4</revnumber>
<date>2001-07-02</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Contributor's was misspelled, changed to
Contributor's.</revremark>
</revision>


<revision>
<revnumber>0.0.3</revnumber>
<date>2001-06-13</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revdescription>
<itemizedlist>

<listitem>
<para>Programming: Added a section on how to install a local
build.</para>
</listitem>

<listitem>
<para>Programming: Added information on how long commands take on a
benchmark machine, how many files they generate, and how much disk
space those files require.</para>
</listitem>

</itemizedlist>
</revdescription>

</revision>


<revision>
<revnumber>0.0.2</revnumber>
<date>2001-06-12</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revdescription>
<itemizedlist>

<listitem>
<para>Programming: Added a section on how to update one's source code
tree.</para>
</listitem>

</itemizedlist>
</revdescription>

</revision>


<revision>
<revnumber>0.0.1</revnumber>
<date>2001-06-11</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Initial content for the Programming chapter.</revremark>
</revision>


<revision>
<revnumber>0.0.0</revnumber>
<date>2001-05-22</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Initial release.</revremark>
</revision>

</revhistory>

</bookinfo>

<toc></toc>

&overview;
&programming;
&documentation;
&website;
&biblio;
&glossary;
&fdl;

</book>

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/Makefile.am	5 Sep 2003 17:37:20 -0000	1.1.1.1
+++ b/Makefile.am	10 Mar 2004 00:52:01 -0000	1.2
@@ -10,7 +10,7 @@
 
 ## Source files
 
-cg_xml_source = cygwin-xfree-cg.xml
+cg_xml_source = cygwin-x-cg.xml
 extra_cg_xml_source = biblio.xml \
 	documentation.xml \
 	documentation-build.xml \
@@ -32,10 +32,10 @@
 
 extra_cg_html = biblio.html \
 	documentation.html \
-	documentation-build.html \
-	documentation-distribution.html \
-	documentation-docbook.html \
-	documentation-obtaining-source.html \
+	docs-build.html \
+	docs-distribution.html \
+	docs-docbook.html \
+	docs-obtaining-source.html \
 	gfdl.html \
 	gfdl-aggregation-with-independent-works.html \
 	gfdl-applicability-and-definitions.html \
@@ -53,7 +53,7 @@
 	programming.html \
 	prog-tree-layout.html \
 	prog-server-architecture.html \
-	prog-obtaining-souce.html \
+	prog-obtaining-source.html \
 	prog-build-native.html \
 	prog-build-cross.html \
 	prog-distribution.html \
@@ -61,22 +61,22 @@
 
 ## Files generated by other builds
 
-extra_cg_ps = cygwin-xfree-cg.ps
-extra_cg_ps_gz = cygwin-xfree-cg.ps.gz
-extra_cg_pdf = cygwin-xfree-cg.pdf
-extra_cg_txt = cygwin-xfree-cg.txt
-extra_cg_rtf = cygwin-xfree-cg.rtf
-extra_cg_dvi = cygwin-xfree-cg.dvi
-extra_cg_tex = cygwin-xfree-cg.tex
+extra_cg_ps = cygwin-x-cg.ps
+extra_cg_ps_gz = cygwin-x-cg.ps.gz
+extra_cg_pdf = cygwin-x-cg.pdf
+extra_cg_txt = cygwin-x-cg.txt
+extra_cg_rtf = cygwin-x-cg.rtf
+extra_cg_dvi = cygwin-x-cg.dvi
+extra_cg_tex = cygwin-x-cg.tex
 
-cgdir = $(pkgdatadir)/cg
-cg_DATA = cygwin-xfree-cg.html $(extra_cg_html) $(extra_cg_ps_gz) \
+cgdir = $(docdir)/cg
+cg_DATA = cygwin-x-cg.html $(extra_cg_html) $(extra_cg_ps_gz) \
 	$(extra_cg_pdf) $(extra_cg_txt) $(extra_cg_rtf)
 EXTRA_DIST = $(cg_xml_source) $(extra_cg_xml_source)
 
 ## Dependency rules follow
 
-cygwin-xfree-cg.html $(extra_cg_html): $(HTML_SS) $(cg_xml_source) \
+cygwin-x-cg.html $(extra_cg_html): $(HTML_SS) $(cg_xml_source) \
 	$(extra_cg_xml_source) $(ENTITIES) $(FDL)
 
 $(extra_cg_tex): $(cg_xml_source) $(extra_cg_xml_source)
@@ -96,7 +96,8 @@
 ## General rules follow
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag -s $(srcdir)/$(cg_xml_source)
@@ -132,7 +133,7 @@
 $(extra_cg_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-cg.html:
+cygwin-x-cg.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(cg_xml_source)"
 

Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.in	29 Feb 2004 23:36:11 -0000	1.2
+++ b/Makefile.in	10 Mar 2004 00:52:01 -0000	1.3
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,66 +12,84 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-HAVE_LIB = @HAVE_LIB@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JADE = @JADE@
-LIB = @LIB@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIB = @LTLIB@
+LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
-
+ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+docdir = @docdir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 MAX_TEX_RECURSION = 4
 
 XML_DECL = $(srcdir)/../stylesheets/xml.dcl
@@ -80,151 +100,226 @@
 ENTITIES = $(srcdir)/../common/entities.xml
 FDL = $(srcdir)/../common/fdl.xml
 
-cg_xml_source = cygwin-xfree-cg.xml
-extra_cg_xml_source = biblio.xml 	documentation.xml 	documentation-build.xml 	documentation-distribution.xml 	documentation-docbook.xml 	documentation-obtaining-source.xml 	glossary.xml 	overview.xml 	programming.xml 	programming-tree-layout.xml 	programming-server-architecture.xml 	programming-obtaining-source.xml 	programming-native.xml 	programming-cross.xml 	programming-distribution.xml 	website.xml
+cg_xml_source = cygwin-x-cg.xml
+extra_cg_xml_source = biblio.xml \
+	documentation.xml \
+	documentation-build.xml \
+	documentation-distribution.xml \
+	documentation-docbook.xml \
+	documentation-obtaining-source.xml \
+	glossary.xml \
+	overview.xml \
+	programming.xml \
+	programming-tree-layout.xml \
+	programming-server-architecture.xml \
+	programming-obtaining-source.xml \
+	programming-native.xml \
+	programming-cross.xml \
+	programming-distribution.xml \
+	website.xml
 
 
-extra_cg_html = biblio.html 	documentation.html 	documentation-build.html 	documentation-distribution.html 	documentation-docbook.html 	documentation-obtaining-source.html 	gfdl.html 	gfdl-aggregation-with-independent-works.html 	gfdl-applicability-and-definitions.html 	gfdl-collections-of-documents.html 	gfdl-combining-documents.html 	gfdl-copying-in-quantity.html 	gfdl-future-revisions-of-this-license.html 	gfdl-modifications.html 	gfdl-termination.html 	gfdl-translation.html 	gfdl-using-for-your-documents.html 	gfdl-verbation-copying.html 	glossary.html 	overview.html 	programming.html 	prog-tree-layout.html 	prog-server-architecture.html 	prog-obtaining-souce.html 	prog-build-native.html 	prog-build-cross.html 	prog-distribution.html 	website.html
+extra_cg_html = biblio.html \
+	documentation.html \
+	docs-build.html \
+	docs-distribution.html \
+	docs-docbook.html \
+	docs-obtaining-source.html \
+	gfdl.html \
+	gfdl-aggregation-with-independent-works.html \
+	gfdl-applicability-and-definitions.html \
+	gfdl-collections-of-documents.html \
+	gfdl-combining-documents.html \
+	gfdl-copying-in-quantity.html \
+	gfdl-future-revisions-of-this-license.html \
+	gfdl-modifications.html \
+	gfdl-termination.html \
+	gfdl-translation.html \
+	gfdl-using-for-your-documents.html \
+	gfdl-verbation-copying.html \
+	glossary.html \
+	overview.html \
+	programming.html \
+	prog-tree-layout.html \
+	prog-server-architecture.html \
+	prog-obtaining-source.html \
+	prog-build-native.html \
+	prog-build-cross.html \
+	prog-distribution.html \
+	website.html
 
 
-extra_cg_ps = cygwin-xfree-cg.ps
-extra_cg_ps_gz = cygwin-xfree-cg.ps.gz
-extra_cg_pdf = cygwin-xfree-cg.pdf
-extra_cg_txt = cygwin-xfree-cg.txt
-extra_cg_rtf = cygwin-xfree-cg.rtf
-extra_cg_dvi = cygwin-xfree-cg.dvi
-extra_cg_tex = cygwin-xfree-cg.tex
+extra_cg_ps = cygwin-x-cg.ps
+extra_cg_ps_gz = cygwin-x-cg.ps.gz
+extra_cg_pdf = cygwin-x-cg.pdf
+extra_cg_txt = cygwin-x-cg.txt
+extra_cg_rtf = cygwin-x-cg.rtf
+extra_cg_dvi = cygwin-x-cg.dvi
+extra_cg_tex = cygwin-x-cg.tex
 
-cgdir = $(pkgdatadir)/cg
-cg_DATA = cygwin-xfree-cg.html $(extra_cg_html) $(extra_cg_ps_gz) 	$(extra_cg_pdf) $(extra_cg_txt) $(extra_cg_rtf)
+cgdir = $(docdir)/cg
+cg_DATA = cygwin-x-cg.html $(extra_cg_html) $(extra_cg_ps_gz) \
+	$(extra_cg_pdf) $(extra_cg_txt) $(extra_cg_rtf)
 
 EXTRA_DIST = $(cg_xml_source) $(extra_cg_xml_source)
+subdir = cg
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(cg_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(cg_DATA)
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+all: all-am
 
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign cg/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  cg/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+cgDATA_INSTALL = $(INSTALL_DATA)
 install-cgDATA: $(cg_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(cgdir)
 	@list='$(cg_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cgdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cgdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(cgdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(cgdir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(cgDATA_INSTALL) $$d$$p $(DESTDIR)$(cgdir)/$$f"; \
+	  $(cgDATA_INSTALL) $$d$$p $(DESTDIR)$(cgdir)/$$f; \
 	done
 
 uninstall-cgDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(cg_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(cgdir)/$$p; \
+	@list='$(cg_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(cgdir)/$$f"; \
+	  rm -f $(DESTDIR)$(cgdir)/$$f; \
 	done
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = cg
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign cg/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-cgDATA
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(cgdir)
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-cgDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(cgdir)
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am clean-local
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-am
+info: info-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am: install-cgDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
-.PHONY: uninstall-cgDATA install-cgDATA tags distdir info-am info dvi-am \
-dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-am
 
+mostlyclean-am: mostlyclean-generic
 
-cygwin-xfree-cg.html $(extra_cg_html): $(HTML_SS) $(cg_xml_source) \
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-cgDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-cgDATA install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-cgDATA uninstall-info-am
+
+
+cygwin-x-cg.html $(extra_cg_html): $(HTML_SS) $(cg_xml_source) \
 	$(extra_cg_xml_source) $(ENTITIES) $(FDL)
 
 $(extra_cg_tex): $(cg_xml_source) $(extra_cg_xml_source)
@@ -242,7 +337,8 @@
 $(extra_cg_rtf): $(cg_xml_source) $(extra_cg_xml_source)
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag -s $(srcdir)/$(cg_xml_source)
@@ -274,7 +370,7 @@
 $(extra_cg_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-cg.html:
+cygwin-x-cg.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(cg_xml_source)"
 
@@ -288,7 +384,6 @@
 $(extra_cg_rtf):
 	$(SHELL) -c "$(JADE) -t rtf -d $(PRINT_SS) -o $@ $(XML_DECL) \
 	$(srcdir)/$(cg_xml_source)"
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

--- cygwin-xfree-cg.xml DELETED ---