Makefile.am: XML output names have only .xml suffix.

2012-03-22  Benjamin Kosnik  <bkoz@redhat.com>

	* doc/Makefile.am: XML output names have only .xml suffix.
	* doc/Makefile.in: Regenerate.

From-SVN: r185716

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a618d2a7499852263cae8413993eeff1907357bb..3e2a24e4b4df2158d968c787dda5b2d1859ef5cb 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * doc/Makefile.am: XML output names have only .xml suffix.
+       * doc/Makefile.in: Regenerate.
+
 2012-03-22  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/std/array (array<>::at(size_type) const): Fix version

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 0f7b2852bcbfd482d521e2a6bbab66fc4baa3c86..95d8513ad46a033a05a66e611282a181a4c26c80 100644 (file)
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the doc subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+## Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -206,7 +206,7 @@ doc-install-epub: doc-epub
 # Assumes doxygen, graphviz (with dot), pdflatex installed
 doxygen_script=${top_srcdir}/scripts/run_doxygen
 doxygen_outdir = ${glibcxx_builddir}/doc/doxygen
-api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml
+api_xml = ${doxygen_outdir}/xml/libstdc++-api.xml
 doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
 api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
 
@@ -505,8 +505,8 @@ doc-xml-validate-docbook: $(xml_sources) $(xml_images)
 # XML, all one page
 # Some info on canonicalization
 # http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html
-manual_xml = ${docbook_outdir}/xml/libstdc++-manual-single.xml
-set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml
+manual_xml = ${docbook_outdir}/xml/libstdc++-manual.xml
+set_xml = ${docbook_outdir}/xml/libstdc++-set.xml
 stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml
        @echo "Generating XML single..."
        $(XMLLINT) $(XMLLINT_FLAGS) \

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index 39c7e1f5b2781e3bfaad37e4d18bfb2bd2b566d3..fe6ac6347163fe01a6c6ed5b712cde4f6a613f48 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -335,7 +335,7 @@ epubdir = "$(DESTDIR)@docdir@"
 # Assumes doxygen, graphviz (with dot), pdflatex installed
 doxygen_script = ${top_srcdir}/scripts/run_doxygen
 doxygen_outdir = ${glibcxx_builddir}/doc/doxygen
-api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml
+api_xml = ${doxygen_outdir}/xml/libstdc++-api.xml
 doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
 api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
 
@@ -529,8 +529,8 @@ XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
 # XML, all one page
 # Some info on canonicalization
 # http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html
-manual_xml = ${docbook_outdir}/xml/libstdc++-manual-single.xml
-set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml
+manual_xml = ${docbook_outdir}/xml/libstdc++-manual.xml
+set_xml = ${docbook_outdir}/xml/libstdc++-set.xml
 
 # HTML, all one page
 manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html