2012-01-17 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / doc / Makefile.in

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index 4304567..7a5498e 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
 DBLATEX = @DBLATEX@
-DBTOEPUB = @DBTOEPUB@
 DEBUG_FLAGS = @DEBUG_FLAGS@
 DEFS = @DEFS@
 DOT = @DOT@
@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PDFLATEX = @PDFLATEX@
 RANLIB = @RANLIB@
-RUBY = @RUBY@
 SECTION_FLAGS = @SECTION_FLAGS@
 SECTION_LDFLAGS = @SECTION_LDFLAGS@
 SED = @SED@
@@ -215,7 +213,6 @@ glibcxx_builddir = @glibcxx_builddir@
 glibcxx_localedir = @glibcxx_localedir@
 glibcxx_prefixdir = @glibcxx_prefixdir@
 glibcxx_srcdir = @glibcxx_srcdir@
-glibcxx_thread_h = @glibcxx_thread_h@
 glibcxx_toolexecdir = @glibcxx_toolexecdir@
 glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
@@ -263,6 +260,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+toplevel_builddir = @toplevel_builddir@
 toplevel_srcdir = @toplevel_srcdir@
 
 # May be used by various substitution variables.
@@ -280,7 +278,7 @@ CONFIG_CXXFLAGS = \
        $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@
 
 WARN_CXXFLAGS = \
-       $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
+       $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once -Wabi
 
 
 # -I/-D flags to pass when compiling.
@@ -390,7 +388,7 @@ xml_sources_manual = \
        ${xml_dir}/manual/shared_ptr.xml \
        ${xml_dir}/manual/spine.xml \
        ${xml_dir}/manual/status_cxx1998.xml \
-       ${xml_dir}/manual/status_cxx200x.xml \
+       ${xml_dir}/manual/status_cxx2011.xml \
        ${xml_dir}/manual/status_cxxtr1.xml \
        ${xml_dir}/manual/status_cxxtr24733.xml \
        ${xml_dir}/manual/strings.xml \
@@ -518,7 +516,7 @@ XSLT_PARAM = --param toc.section.depth 4
 XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl
 XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl
 XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
-XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
+XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl
 LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
 SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd
 #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
@@ -549,8 +547,9 @@ DB2TEXI_FLAGS = \
        --string-param explicit-node-names=true
 
 
-# EPUB, via ruby + dbtoepub
-# Can verify document with: epubcheck
+# EPUB version 3
+# http://sourceforge.net/projects/docbook/files/epub3/
+# Can verify document with epubcheck
 manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
 
 # Performance doc and graph configuration.
@@ -871,6 +870,7 @@ doc-man-doxygen: stamp-man-doxygen
 
 ${docbook_outdir}/epub:
        mkdir -p ${docbook_outdir}/epub
+       mkdir -p ${docbook_outdir}/epub/OEBPS/images
 
 ${docbook_outdir}/fo:
        mkdir -p ${docbook_outdir}/fo
@@ -965,7 +965,12 @@ stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
        if [ ! -d "${docbook_outdir}/images" ]; then \
          $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
        fi
-       ${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml}
+       $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) \
+       --stringparam base.dir "${docbook_outdir}/epub/OEBPS/" \
+       $(XSL_EPUB_STYLE) ${top_srcdir}/doc/xml/spine.xml
+       $(INSTALL_DATA) $(xml_images) ${docbook_outdir}/epub/OEBPS/images
+       zip -X0 ${manual_epub} ${docbook_outdir}/epub/mimetype
+       zip -r -X9 ${manual_epub} ${docbook_outdir}/epub/META-INF ${docbook_outdir}/epub/OEBPS
        $(STAMP) stamp-epub-docbook
 
 doc-epub-docbook: stamp-epub-docbook