diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-03-23 00:00:58 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-03-23 00:00:58 +0000 |
| commit | 81df260f060058a1b0a4670c5bf51be6e0d45177 (patch) | |
| tree | 7aa434981bf47d311b64928ee3a10da228c3713b /libstdc++-v3 | |
| parent | 3fd03b93407407b8bda22b1e9ced8f2ad5250a5a (diff) | |
| download | gcc-81df260f060058a1b0a4670c5bf51be6e0d45177.zip gcc-81df260f060058a1b0a4670c5bf51be6e0d45177.tar.gz gcc-81df260f060058a1b0a4670c5bf51be6e0d45177.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/doc/Makefile.am | 8 | ||||
| -rw-r--r-- | libstdc++-v3/doc/Makefile.in | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a618d2a..3e2a24e 100644 --- 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 0f7b285..95d8513 100644 --- 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 39c7e1f..fe6ac63 100644 --- 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 |