]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - libstdc++-v3/doc/Makefile.in
Update GCC to autoconf 2.69, automake 1.15.1 (PR bootstrap/82856).
[thirdparty/gcc.git] / libstdc++-v3 / doc / Makefile.in
index 6051aa6b456f6c695f8ae26dce3af72496e510a1..0b2f6d663a2caaed7426ff814a8a8df0043c1045 100644 (file)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2017 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.
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \  ]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,16 +88,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
-       $(srcdir)/Makefile.am
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
-       $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
-       $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
-       $(top_srcdir)/crossconfig.m4 $(top_srcdir)/linkage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/enable.m4 \
        $(top_srcdir)/../config/futex.m4 \
+       $(top_srcdir)/../config/hwcaps.m4 \
        $(top_srcdir)/../config/iconv.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
        $(top_srcdir)/../config/lib-ld.m4 \
@@ -55,21 +105,46 @@ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/stdint.m4 \
        $(top_srcdir)/../config/unwind_ipinfo.m4 \
-       $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/gc++filt.m4 \
-       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
+       $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
+       $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/crossconfig.m4 \
+       $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/gc++filt.m4 \
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/../config/gthr.m4 \
+       $(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 depcomp =
 am__depfiles_maybe =
 SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 ABI_TWEAKS_SRCDIR = @ABI_TWEAKS_SRCDIR@
 ACLOCAL = @ACLOCAL@
 ALLOCATOR_H = @ALLOCATOR_H@
 ALLOCATOR_NAME = @ALLOCATOR_NAME@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 ATOMICITY_SRCDIR = @ATOMICITY_SRCDIR@
@@ -96,6 +171,8 @@ CNUMERIC_CC = @CNUMERIC_CC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
+CPU_OPT_BITS_RANDOM = @CPU_OPT_BITS_RANDOM@
+CPU_OPT_EXT_RANDOM = @CPU_OPT_EXT_RANDOM@
 CSTDIO_H = @CSTDIO_H@
 CTIME_CC = @CTIME_CC@
 CTIME_H = @CTIME_H@
@@ -105,8 +182,11 @@ CXXFILT = @CXXFILT@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 C_INCLUDE_DIR = @C_INCLUDE_DIR@
+DBLATEX = @DBLATEX@
 DEBUG_FLAGS = @DEBUG_FLAGS@
 DEFS = @DEFS@
+DOT = @DOT@
+DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -115,11 +195,13 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 ERROR_CONSTANTS_SRCDIR = @ERROR_CONSTANTS_SRCDIR@
 EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
 FGREP = @FGREP@
 GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 GLIBCXX_LIBS = @GLIBCXX_LIBS@
 GREP = @GREP@
+HWCAP_CFLAGS = @HWCAP_CFLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -130,10 +212,10 @@ LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LONG_DOUBLE_COMPAT_FLAGS = @LONG_DOUBLE_COMPAT_FLAGS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -156,6 +238,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 RANLIB = @RANLIB@
 SECTION_FLAGS = @SECTION_FLAGS@
 SECTION_LDFLAGS = @SECTION_LDFLAGS@
@@ -167,8 +250,15 @@ SYMVER_FILE = @SYMVER_FILE@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VTV_CXXFLAGS = @VTV_CXXFLAGS@
+VTV_CXXLINKFLAGS = @VTV_CXXLINKFLAGS@
+VTV_PCH_CXXFLAGS = @VTV_PCH_CXXFLAGS@
 WARN_FLAGS = @WARN_FLAGS@
-WERROR = @WERROR@
+
+# Validate existing XML structure.
+XMLLINT = xmllint
+XSLTPROC = xsltproc
+XSL_STYLE_DIR = @XSL_STYLE_DIR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -180,6 +270,7 @@ am__leading_dot = @am__leading_dot@
 am__tar = @am__tar@
 am__untar = @am__untar@
 baseline_dir = @baseline_dir@
+baseline_subdir_switch = @baseline_subdir_switch@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -195,14 +286,18 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+get_gcc_base_ver = @get_gcc_base_ver@
 glibcxx_MOFILES = @glibcxx_MOFILES@
 glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
 glibcxx_POFILES = @glibcxx_POFILES@
 glibcxx_builddir = @glibcxx_builddir@
+glibcxx_compiler_pic_flag = @glibcxx_compiler_pic_flag@
+glibcxx_compiler_shared_flag = @glibcxx_compiler_shared_flag@
+glibcxx_cxx98_abi = @glibcxx_cxx98_abi@
 glibcxx_localedir = @glibcxx_localedir@
+glibcxx_lt_pic_flag = @glibcxx_lt_pic_flag@
 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@
@@ -211,9 +306,13 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-htmldir = @htmldir@
+
+# HTML
+htmldir = "$(DESTDIR)@docdir@"
 includedir = @includedir@
-infodir = @infodir@
+
+# TEXINFO,INFO
+infodir = "$(DESTDIR)@infodir@"
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
@@ -221,15 +320,20 @@ libtool_VERSION = @libtool_VERSION@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_host_flags = @lt_host_flags@
-mandir = @mandir@
+
+# MAN
+mandir = "$(DESTDIR)@mandir@"
 mkdir_p = @mkdir_p@
 multi_basedir = @multi_basedir@
 oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
+
+# PDF
+pdfdir = "$(DESTDIR)@docdir@"
 port_specific_symbol_files = @port_specific_symbol_files@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+python_mod_dir = @python_mod_dir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -239,43 +343,87 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+thread_header = @thread_header@
 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.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 PWD_COMMAND = $${PWDCMD-pwd}
 STAMP = echo timestamp >
 toolexecdir = $(glibcxx_toolexecdir)
 toolexeclibdir = $(glibcxx_toolexeclibdir)
+@ENABLE_WERROR_FALSE@WERROR_FLAG = 
+@ENABLE_WERROR_TRUE@WERROR_FLAG = -Werror
+@ENABLE_EXTERN_TEMPLATE_FALSE@XTEMPLATE_FLAGS = 
+@ENABLE_EXTERN_TEMPLATE_TRUE@XTEMPLATE_FLAGS = -fno-implicit-templates
 
 # These bits are all figured out from configure.  Look in acinclude.m4
 # or configure.ac to see how they are set.  See GLIBCXX_EXPORT_FLAGS.
 CONFIG_CXXFLAGS = \
-       $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS)
+       $(SECTION_FLAGS) $(HWCAP_CFLAGS) -frandom-seed=$@
 
 WARN_CXXFLAGS = \
-       $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
+       $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
+@BUILD_XML_FALSE@STAMP_XML = 
+
+# Documentation Overview
+#
+# There are two main input materials for libstdc++ documentation.
+# The first is the doxygen markup in libstdc++ sources, which is a
+# reference to the API. And the second is the manual, via docbook markup in
+# doc/xml/.
+#
+# A third and more obscure option deals with charting performance
+# tests, and should be considered experimental.
+
+# Documentation conditionals for output.
+@BUILD_XML_TRUE@STAMP_XML = doc-xml
+@BUILD_XML_FALSE@STAMP_INSTALL_XML = 
+@BUILD_XML_TRUE@STAMP_INSTALL_XML = doc-install-xml
+@BUILD_HTML_FALSE@STAMP_HTML = 
+@BUILD_HTML_TRUE@STAMP_HTML = doc-html
+@BUILD_HTML_FALSE@STAMP_INSTALL_HTML = 
+@BUILD_HTML_TRUE@STAMP_INSTALL_HTML = doc-install-html
+@BUILD_MAN_FALSE@STAMP_MAN = 
+@BUILD_MAN_TRUE@STAMP_MAN = doc-man
+@BUILD_MAN_FALSE@STAMP_INSTALL_MAN = 
+@BUILD_MAN_TRUE@STAMP_INSTALL_MAN = doc-install-man
+@BUILD_PDF_FALSE@STAMP_PDF = 
+@BUILD_PDF_TRUE@STAMP_PDF = doc-pdf
+@BUILD_PDF_FALSE@STAMP_INSTALL_PDF = 
+@BUILD_PDF_TRUE@STAMP_INSTALL_PDF = doc-install-pdf
+@BUILD_EPUB_FALSE@STAMP_EPUB = doc-epub
+@BUILD_EPUB_TRUE@STAMP_EPUB = doc-epub
+@BUILD_EPUB_FALSE@STAMP_INSTALL_EPUB = doc-install-epub
+@BUILD_EPUB_TRUE@STAMP_INSTALL_EPUB = doc-install-epub
+
+# Default creation and installation rules.
+# Point to best sub-rule for the requested documentation target and
+# create, and then install toplevel directory with standardized names
+# and layouts.
+
+# XML
+xmldir = "$(DESTDIR)@docdir@"
+
+# EPUB
+# Assumes ruby installed
+epubdir = "$(DESTDIR)@docdir@"
 
 # Doxygen configuration
 # 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
-
-# Chance of loooooonnggg creation time on this rule.  Iff this fails,
-# look at refman.log and see if TeX's memory is exhausted. Symptoms
-# include asking a wizard to enlarge capacity. If this is the case,
-# find texmf.cnf and add a zero for pool_size, string_vacancies,
-# max_strings, and pool_free values.
+api_xml = ${doxygen_outdir}/xml/libstdc++-api.xml
 doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
 api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
 
@@ -286,7 +434,6 @@ api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
 # pdflatex
 # docbook-style-xsl
 # emacs-nxml-mode
-# xmlto passivetex
 docbook_outdir = ${glibcxx_builddir}/doc/docbook
 xml_dir = ${glibcxx_srcdir}/doc/xml
 xml_sources_basic = \
@@ -313,6 +460,7 @@ xml_sources_manual = \
        ${xml_dir}/manual/debug_mode.xml \
        ${xml_dir}/manual/debug.xml \
        ${xml_dir}/manual/diagnostics.xml \
+       ${xml_dir}/manual/documentation_hacking.xml \
        ${xml_dir}/manual/evolution.xml \
        ${xml_dir}/manual/extensions.xml \
        ${xml_dir}/manual/internals.xml \
@@ -325,17 +473,21 @@ xml_sources_manual = \
        ${xml_dir}/manual/mt_allocator.xml \
        ${xml_dir}/manual/numerics.xml \
        ${xml_dir}/manual/parallel_mode.xml \
+       ${xml_dir}/manual/policy_data_structures.xml \
+       ${xml_dir}/manual/policy_data_structures_biblio.xml \
        ${xml_dir}/manual/prerequisites.xml \
        ${xml_dir}/manual/profile_mode.xml \
        ${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_cxx2014.xml \
        ${xml_dir}/manual/status_cxxtr1.xml \
        ${xml_dir}/manual/status_cxxtr24733.xml \
        ${xml_dir}/manual/strings.xml \
        ${xml_dir}/manual/support.xml \
        ${xml_dir}/manual/test.xml \
+       ${xml_dir}/manual/test_policy_data_structures.xml \
        ${xml_dir}/manual/using.xml \
        ${xml_dir}/manual/using_exceptions.xml \
        ${xml_dir}/manual/utilities.xml \
@@ -344,9 +496,7 @@ xml_sources_manual = \
        ${xml_dir}/manual/appendix_porting.xml
 
 xml_sources_extra = \
-       ${xml_dir}/gnu/fdl-1.2.xml \
        ${xml_dir}/gnu/fdl-1.3.xml \
-       ${xml_dir}/gnu/gpl-2.0.xml \
        ${xml_dir}/gnu/gpl-3.0.xml
 
 xml_sources = \
@@ -354,41 +504,132 @@ xml_sources = \
        ${xml_sources_manual} \
        ${xml_sources_extra}
 
+xml_image_dir = ${xml_dir}/images
+xml_image_basic = \
+       ${xml_image_dir}/confdeps.png \
+       ${xml_image_dir}/pbds_balls_and_bins.png \
+       ${xml_image_dir}/pbds_container_tag_hierarchy.png \
+       ${xml_image_dir}/pbds_different_underlying_dss_1.png \
+       ${xml_image_dir}/pbds_different_underlying_dss_2.png \
+       ${xml_image_dir}/pbds_embedded_lists_1.png \
+       ${xml_image_dir}/pbds_embedded_lists_2.png \
+       ${xml_image_dir}/pbds_embedded_lists_3.png \
+       ${xml_image_dir}/pbds_exception_hierarchy.png \
+       ${xml_image_dir}/pbds_hash_policy_cd.png \
+       ${xml_image_dir}/pbds_hash_ranged_hash_range_hashing_fns.png \
+       ${xml_image_dir}/pbds_hash_range_hashing_seq_diagram2.png \
+       ${xml_image_dir}/pbds_hash_range_hashing_seq_diagram.png \
+       ${xml_image_dir}/pbds_insert_resize_sequence_diagram1.png \
+       ${xml_image_dir}/pbds_insert_resize_sequence_diagram2.png \
+       ${xml_image_dir}/pbds_insert_resize_sequence_diagram3.png \
+       ${xml_image_dir}/pbds_invalidation_guarantee_erase.png \
+       ${xml_image_dir}/pbds_invalidation_tag_hierarchy.png \
+       ${xml_image_dir}/pbds_list_update.png \
+       ${xml_image_dir}/pbds_node_invariants.png \
+       ${xml_image_dir}/pbds_pat_trie.png \
+       ${xml_image_dir}/pbds_point_iterator_hierarchy.png \
+       ${xml_image_dir}/pbds_point_iterators_range_ops_1.png \
+       ${xml_image_dir}/pbds_point_iterators_range_ops_2.png \
+       ${xml_image_dir}/pbds_priority_queue_different_underlying_dss.png \
+       ${xml_image_dir}/pbds_priority_queue_tag_hierarchy.png \
+       ${xml_image_dir}/pbds_rationale_null_node_updator.png \
+       ${xml_image_dir}/pbds_resize_policy_cd.png \
+       ${xml_image_dir}/pbds_restoring_node_invariants.png \
+       ${xml_image_dir}/pbds_simple_list.png \
+       ${xml_image_dir}/pbds_tree_node_invalidations.png \
+       ${xml_image_dir}/pbds_tree_node_invariants.png \
+       ${xml_image_dir}/pbds_tree_node_updator_policy_cd.png \
+       ${xml_image_dir}/pbds_trie_node_updator_policy_cd.png \
+       ${xml_image_dir}/pbds_update_seq_diagram.png
+
+xml_image_generated = \
+       ${xml_image_dir}/pbds_binary_priority_queue_int_push_pop.png \
+       ${xml_image_dir}/pbds_binary_priority_queue_int_push.png \
+       ${xml_image_dir}/pbds_ccgp_hash_int_subscript_insert.png \
+       ${xml_image_dir}/pbds_cc_hash_int_find.png \
+       ${xml_image_dir}/pbds_cc_hash_int_subscript_find.png \
+       ${xml_image_dir}/pbds_cc_hash_int_subscript_insert.png \
+       ${xml_image_dir}/pbds_gp_hash_int_find.png \
+       ${xml_image_dir}/pbds_gp_hash_int_subscript_find.png \
+       ${xml_image_dir}/pbds_gp_hash_int_subscript_insert.png \
+       ${xml_image_dir}/pbds_hash_int_erase_mem.png \
+       ${xml_image_dir}/pbds_hash_text_find.png \
+       ${xml_image_dir}/pbds_hash_zlob_int_find.png \
+       ${xml_image_dir}/pbds_multimap_text_find_large_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_find_large_s2p_tree.png \
+       ${xml_image_dir}/pbds_multimap_text_find_small_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_find_small_s2p_tree.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_large_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_large_s2p_tree.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_mem_large_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_mem_large_s2p_tree.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_mem_small_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_mem_small_s2p_tree.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_small_s2p_hash.png \
+       ${xml_image_dir}/pbds_multimap_text_insert_small_s2p_tree.png \
+       ${xml_image_dir}/pbds_pairing_priority_queue_text_modify_down_thin.png \
+       ${xml_image_dir}/pbds_pairing_priority_queue_text_modify_up_thin.png \
+       ${xml_image_dir}/pbds_pairing_priority_queue_text_push_pop.png \
+       ${xml_image_dir}/pbds_pairing_priority_queue_text_push.png \
+       ${xml_image_dir}/pbds_priority_queue_int_push_pop.png \
+       ${xml_image_dir}/pbds_priority_queue_int_push.png \
+       ${xml_image_dir}/pbds_priority_queue_text_join.png \
+       ${xml_image_dir}/pbds_priority_queue_text_modify_down.png \
+       ${xml_image_dir}/pbds_priority_queue_text_modify_up.png \
+       ${xml_image_dir}/pbds_priority_queue_text_pop_mem.png \
+       ${xml_image_dir}/pbds_priority_queue_text_push_pop.png \
+       ${xml_image_dir}/pbds_priority_queue_text_push.png \
+       ${xml_image_dir}/pbds_tree_int_find.png \
+       ${xml_image_dir}/pbds_tree_order_statistics.png \
+       ${xml_image_dir}/pbds_tree_split_join.png \
+       ${xml_image_dir}/pbds_tree_text_find.png \
+       ${xml_image_dir}/pbds_tree_text_insert_node.png \
+       ${xml_image_dir}/pbds_tree_text_insert_trie.png \
+       ${xml_image_dir}/pbds_tree_text_insert_vector.png \
+       ${xml_image_dir}/pbds_tree_text_lor_find.png
+
+xml_images = ${xml_image_basic} ${xml_image_generated}
 xml_noinst = \
        ${xml_dir}/book.txml \
        ${xml_dir}/chapter.txml \
-       ${xml_dir}/class.txml
-
-XSLTPROC = xsltproc
-XSLTPROC_FLAGS = --nonet --xinclude
-XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
+       ${xml_dir}/class.txml \
+       ${xml_image_dir}/confdeps.dot \
+       ${xml_image_dir}/confdeps.pdf
+
+XSLT_FLAGS = --nonet --xinclude
+XSLT_PARAM = --param toc.section.depth 4 --param generate.consistent.ids 1
+#XSL_STYLE_DIR = /usr/share/xml/docbook/stylesheet/docbook-xsl-ns
+#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
 XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl
 XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml/chunk.xsl
-#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/onechunk.xsl
-XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/docbook.xsl
-
-# Validate existing XML structure.
-XMLLINT = xmllint
-#LINT_FLAGS = --debug --nonet --xinclude --nsclean --postvalid --nowarning
-#LINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent
-LINT_FLAGS = --debug --xinclude --noent --noblanks  --nonet --noout
-#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng
-SCHEMA_FLAGS = --dtdvalid /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
-XMLLINT_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
+XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/html/docbook.xsl
+XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl
+XSL_LOCAL_STYLE = ${glibcxx_builddir}/doc/xsl/customization.xsl
 
 # 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
+manual_xml = ${docbook_outdir}/xml/libstdc++-manual.xml
+set_xml = ${docbook_outdir}/xml/libstdc++-set.xml
+LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
+SCHEMA_FLAGS = --dtdvalid http://www.docbook.org/xml/5.0/dtd/docbook.dtd
+SCHEMA_RNG_FLAGS = --relaxng http://www.docbook.org/xml/5.0/rng/docbook.rng
+#SCHEMA_FLAGS = --nonet --dtdvalid /usr/share/xxx/dtd/5.0/docbook.dtd
+XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS)
+XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata
 
 # HTML, all one page
+# NB: Have to generate customization XSL for UTF-8 output.
 manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html
 
 # PDF, via dblatex
 manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
-DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf}
+DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex
 
-# Texinfo, via docbook2X
+# TEXINFO, via docbook2X
+# NB: Both experimental and tempermental
+manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi
+manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info
 DB2TEXI_FLAGS = \
        --encoding=utf-8//TRANSLIT \
        --string-param output-file="libstdc++-manual" \
@@ -396,13 +637,18 @@ DB2TEXI_FLAGS = \
        --string-param explicit-node-names=true
 
 
+# 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.
 # Assumes pychart, beautiful soup installed.
-# Generates the plots and graphs for performance testing.
-doc_performance_script = ${top_srcdir}/scripts/make_graphs.py
+# Generates the plots/graph imagery for performance testing.
+doc_performance_script = ${top_srcdir}/scripts/make_graph.py
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.log
+CLEANFILES = *.log stamp*
 all: all-am
 
 .SUFFIXES:
@@ -418,7 +664,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps doc/Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign --ignore-deps doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -427,6 +672,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
+$(top_srcdir)/fragment.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -442,11 +688,11 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 check-am: all-am
 check: check-am
@@ -462,10 +708,15 @@ install-am: all-am
 
 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
+       if test -z '$(STRIP)'; then \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+             install; \
+       else \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+       fi
 mostlyclean-generic:
 
 clean-generic:
@@ -486,42 +737,24 @@ distclean: distclean-am
        -rm -f Makefile
 distclean-am: clean-am distclean-generic
 
-dvi: dvi-am
-
 dvi-am:
 
-html: html-am
-
 html-am:
 
-info: info-am
-
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-am
-
 install-html-am:
 
-install-info: install-info-am
-
 install-info-am:
 
-install-man:
-
-install-pdf: install-pdf-am
-
 install-pdf-am:
 
-install-ps: install-ps-am
-
 install-ps-am:
 
 installcheck-am:
@@ -534,12 +767,8 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-pdf: pdf-am
-
 pdf-am:
 
-ps: ps-am
-
 ps-am:
 
 uninstall-am:
@@ -547,87 +776,172 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       clean-local distclean distclean-generic distclean-libtool dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+       clean-local cscopelist-am ctags-am distclean distclean-generic \
+       distclean-libtool dvi dvi-am html html-am info info-am install \
+       install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am install-html \
+       install-html-am install-info install-info-am install-man \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
 
-# Documentation Overview
-#
-# There are two main source materials for libstdc++ documentation.
-# The first is the doxygen markup in libstdc++ sources, which is a
-# reference to the API. And the second is the docbook markup in
-# doc/xml/.
-#
-# A third and more obscure option deals with charting
-# performance tests, and should be considered experimental.
 
-# Default rules.
+# Documentation primary rules.
 #
-# Point to best sub-rule for the requested documentation target,
-# create, and then copy into toplevel directory with standardized names
-# and layouts.
+# xml:
+# html:
+# pdf:
+# man:
+# info:
+# ps:
+# dvi:
+# epub:
+# install-xml:
+# install-html:
+# install-pdf:
+# install-man:
+# install-info:
+# install-ps:
+# install-dvi:
+# install-epub:
 
-# HTML
-doc-html: doc-html-docbook doc-html-doxygen
-       cp -R ${docbook_outdir}/html ./libstdc++-manual.html
-       cp -R ${doxygen_outdir}/html ./libstdc++-api.html
+xml: $(STAMP_XML)
+install-xml: $(STAMP_INSTALL_XML)
 
-# MAN
-doc-man: doc-man-doxygen
-       cp -R ${doxygen_outdir}/man ./libstdc++-api.man
+html: $(STAMP_HTML)
+install-html: $(STAMP_INSTALL_HTML)
 
-# PDF
-doc-pdf: doc-pdf-docbook doc-pdf-doxygen
-       cp ${docbook_outdir}/pdf/libstdc++-manual.pdf .
-       cp ${doxygen_outdir}/pdf/libstdc++-api.pdf .
+man: $(STAMP_MAN)
+install-man: $(STAMP_INSTALL_MAN)
 
-# TEXINFO
-doc-texinfo: doc-texinfo-docbook
+pdf: $(STAMP_PDF)
+install-pdf: $(STAMP_INSTALL_PDF)
 
-# XML
-doc-xml: doc-xml-single-docbook doc-xml-single-doxygen
-       cp ${manual_xml} .
-       cp ${api_xml} .
+epub: $(STAMP_EPUB)
+install-epub: $(STAMP_INSTALL_EPUB)
 
-doc-html-doxygen:
-       -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
-         builddir=`cd ..; ${PWD_COMMAND}`; \
-         ${SHELL} ${doxygen_script} \
-         --host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES)
+info:
+install-info:
 
-doc-man-doxygen:
-       -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
-         builddir=`cd ..; ${PWD_COMMAND}`; \
-         ${SHELL} ${doxygen_script} \
-         --host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
+ps:
+install-ps:
+
+dvi:
+install-dvi:
+stamp-xml: stamp-xml-single-docbook stamp-xml-single-doxygen
+       $(STAMP) stamp-xml
+
+doc-xml: stamp-xml
+
+doc-install-xml: doc-xml
+       test -z ${xmldir} || $(mkinstalldirs) ${xmldir}
+       $(INSTALL_DATA) ${manual_xml} ${xmldir}
+       $(INSTALL_DATA) ${api_xml} ${xmldir}
+stamp-html: stamp-html-docbook-data stamp-html-doxygen
+       $(STAMP) stamp-html
+
+doc-html: stamp-html
+
+doc-install-html: doc-html
+       test -z ${htmldir} || $(mkinstalldirs) ${htmldir}
+       cp -r ${docbook_outdir}/html ${htmldir}/libstdc++-manual.html;
+       cp -r ${doxygen_outdir}/html ${htmldir}/libstdc++-api.html;
+stamp-pdf: stamp-pdf-docbook stamp-pdf-doxygen
+       $(STAMP) stamp-pdf
+
+doc-pdf: stamp-pdf
+
+doc-install-pdf: doc-pdf
+       test -z ${pdfdir} || $(mkinstalldirs) ${pdfdir}
+       $(INSTALL_DATA) ${docbook_outdir}/pdf/libstdc++-manual.pdf ${pdfdir}
+       $(INSTALL_DATA) ${doxygen_outdir}/pdf/libstdc++-api.pdf ${pdfdir}
+stamp-man: stamp-man-doxygen
+       $(STAMP) stamp-man
+
+doc-man: stamp-man
+
+doc-install-man: doc-man
+       test -z ${mandir} || $(mkinstalldirs) ${mandir}
+       cp -r ${doxygen_outdir}/man/man3 ${mandir}
+stamp-texinfo: stamp-texinfo-docbook
+       $(STAMP) stamp-texinfo
+
+stamp-info: stamp-info-docbook
+       $(STAMP) stamp-info
+
+doc-texinfo: stamp-texinfo
+
+doc-info: stamp-info
+
+doc-install-texinfo: doc-texinfo
+       test -z ${infodir} || $(mkinstalldirs) ${infodir}
+       $(INSTALL_DATA) ${manual_texi} ${infodir}
+
+doc-install-info: doc-info
+       test -z ${infodir} || $(mkinstalldirs) ${infodir}
+       $(INSTALL_DATA) ${manual_info} ${infodir}
+stamp-epub: stamp-epub-docbook
+       $(STAMP) stamp-epub
+
+doc-epub: stamp-epub
+
+doc-install-epub: doc-epub
+       test -z ${epubdir} || $(mkinstalldirs) ${epubdir}
+       $(INSTALL_DATA) ${manual_epub} ${epubdir}
 
-doc-xml-doxygen:
+${doxygen_outdir}/xml:
+       mkdir -p ${doxygen_outdir}/xml
+
+${doxygen_outdir}/html:
+       mkdir -p ${doxygen_outdir}/html
+
+${doxygen_outdir}/latex:
+       mkdir -p ${doxygen_outdir}/latex
+
+${doxygen_outdir}/pdf:
+       mkdir -p ${doxygen_outdir}/pdf
+
+${doxygen_outdir}/man:
+       mkdir -p ${doxygen_outdir}/man
+
+stamp-xml-doxygen: ${doxygen_outdir}/xml
        -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
          builddir=`cd ..; ${PWD_COMMAND}`; \
          ${SHELL} ${doxygen_script} \
          --host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO)
-doc-xml-single-doxygen: doc-xml-doxygen
+       $(STAMP) stamp-xml-doxygen
+
+stamp-xml-single-doxygen: stamp-xml-doxygen
        @echo "Generating doxygen xml single file..."
        $(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \
        ${doxygen_outdir}/xml/index.xml > ${api_xml};
+       $(STAMP) stamp-xml-single-doxygen
 
-doc-latex-doxygen:
+stamp-html-doxygen: ${doxygen_outdir}/html
        -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
          builddir=`cd ..; ${PWD_COMMAND}`; \
          ${SHELL} ${doxygen_script} \
-         --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO)
+         --host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES)
+       $(STAMP) stamp-html-doxygen
 
-${doxygen_outdir}/pdf:
-       mkdir -p ${doxygen_outdir}/pdf
+stamp-latex-doxygen: ${doxygen_outdir}/latex
+       -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
+         builddir=`cd ..; ${PWD_COMMAND}`; \
+         ${SHELL} ${doxygen_script} \
+         --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO)
+       $(STAMP) stamp-latex-doxygen
 
-doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
+# Chance of loooooonnggg creation time on this rule.  Iff this fails,
+# look at refman.log and see if TeX's memory is exhausted. Symptoms
+# include asking a wizard to enlarge capacity. If this is the case,
+# find texmf.cnf and add a zero for pool_size, string_vacancies,
+# max_strings, and pool_free values.
+# Errors like "File `foo.sty' not found" mean a TeX package is missing.
+stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
        -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
        echo "Generating doxygen pdf file...";
        if [ -f ${doxygen_pdf} ]; then \
@@ -635,85 +949,156 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
          echo ":: PDF file is ${api_pdf}"; \
        else \
          echo "... error"; \
+         grep -F 'LaTeX Error' ${doxygen_outdir}/latex/refman.log; \
          exit 12; \
        fi
-
-stamp-pdf-doxygen:
-       @if [ ! -f stamp-pdf-doxygen ]; then \
-         $(MAKE) doc-pdf-doxygen; \
-       fi
        $(STAMP) stamp-pdf-doxygen
 
-stamp-xml-doxygen:
-       @if [ ! -f stamp-xml-doxygen ]; then \
-         $(MAKE) doc-xml-doxygen; \
-         $(MAKE) doc-xml-single-doxygen; \
-       fi
-       $(STAMP) stamp-xml-doxygen
+stamp-man-doxygen: ${doxygen_outdir}/man
+       -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
+         builddir=`cd ..; ${PWD_COMMAND}`; \
+         ${SHELL} ${doxygen_script} \
+         --host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
+       $(STAMP) stamp-man-doxygen
 
-stamp-latex-doxygen:
-       @if [ ! -f stamp-latex-doxygen ]; then \
-         $(MAKE) doc-latex-doxygen; \
-       fi
-       $(STAMP) stamp-latex-doxygen
+doc-xml-doxygen: stamp-xml-doxygen
+doc-xml-single-doxygen: stamp-xml-single-doxygen
+doc-html-doxygen: stamp-html-doxygen
+doc-latex-doxygen: stamp-latex-doxygen
+doc-pdf-doxygen: stamp-pdf-doxygen
+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
 
 ${docbook_outdir}/html:
        mkdir -p ${docbook_outdir}/html
+       mkdir -p ${docbook_outdir}/html/ext
+       mkdir -p ${docbook_outdir}/html/images
+       mkdir -p ${docbook_outdir}/html/manual
 
 ${docbook_outdir}/pdf:
        mkdir -p ${docbook_outdir}/pdf
 
+${docbook_outdir}/latex:
+       mkdir -p ${docbook_outdir}/latex
+
 ${docbook_outdir}/texinfo:
        mkdir -p ${docbook_outdir}/texinfo
 
 ${docbook_outdir}/xml:
        mkdir -p ${docbook_outdir}/xml
-doc-xml-validate-docbook: $(xml_sources)
-       @echo "Generating XML validation log..."
-       $(XMLLINT) $(XMLLINT_FLAGS) ${top_srcdir}/doc/xml/spine.xml
-doc-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml
+stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml
        @echo "Generating XML single..."
-       $(XMLLINT) --xinclude --noent --noblanks --nocdata --nsclean --c14n \
-       ${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml}
+       $(XMLLINT) $(XMLLINT_FLAGS) \
+       ${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml};
+       $(XMLLINT) $(XMLLINT_FLAGS) \
+       ${top_srcdir}/doc/xml/spine.xml > ${set_xml};
+       $(STAMP) stamp-xml-single-docbook
+
+doc-xml-single-docbook: stamp-xml-single-docbook
+doc-xml-validate-docbook: doc-xml-validate-dtd-db
+
+doc-xml-validate-dtd-db: $(xml_sources) $(xml_images)
+       @echo "Generating XML validation log..."
+       $(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
+
+doc-xml-validate-rng-db: $(xml_sources) $(xml_images) doc-xml-single-docbook
+       @echo "Generating XML RelaxNG validation log..."
+       $(XMLLINT) $(LINT_FLAGS) $(SCHEMA_RNG_FLAGS) ${set_xml}
+
+# HTML support files
+stamp-html-docbook-images: stamp-html-docbook $(xml_images)
+       $(INSTALL_DATA) $(xml_images) ${docbook_outdir}/html/images
+       $(STAMP) stamp-html-docbook-images
 
-# HTML, index plus chapters
-doc-html-docbook: $(xml_sources) ${docbook_outdir}/html
+stamp-html-docbook-data: stamp-html-docbook-images
+       $(STAMP) stamp-html-docbook-data
+
+# HTML, "chunked" into index plus chapters as separate pages
+stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
        @echo "Generating html files..."
-       $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \
-       $(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml
-doc-html-single-docbook: $(xml_sources) ${docbook_outdir}/html
+       $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${docbook_outdir}/html/ \
+        --stringparam chunker.output.encoding UTF-8 \
+       $(XSL_HTML_STYLE) \
+       ${top_srcdir}/doc/xml/spine.xml
+       $(STAMP) stamp-html-docbook
+
+doc-html-docbook: stamp-html-docbook-data
+stamp-html-single-docbook: $(xml_sources) ${docbook_outdir}/html
        @echo "Generating html single file..."
-       $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \
-       $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml
+       $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) -o ${manual_html} \
+       ${XSL_LOCAL_STYLE} \
+       ${top_srcdir}/doc/xml/spine.xml
+       $(STAMP) stamp-html-single-docbook
+
+doc-html-single-docbook: stamp-html-single-docbook
 
 # FO
-doc-fo-docbook: $(xml_sources) ${docbook_outdir}/fo
+stamp-fo-docbook: $(xml_sources) ${docbook_outdir}/fo
        @echo "Generating FO files..."
-       $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \
+       $(XSLTPROC) $(XSLT_FLAGS) -o ${docbook_outdir}/fo/spine.fo \
        $(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml
-doc-pdf-docbook: doc-pdf-dblatex-docbook
+       $(STAMP) stamp-fo-docbook
+
+doc-fo-docbook: stamp-fo-docbook
+
+doc-pdf-docbook-dirs: ${docbook_outdir}/pdf ${docbook_outdir}/latex
 
-doc-pdf-dblatex-docbook: $(xml_sources) ${docbook_outdir}/pdf
+doc-pdf-docbook-pre: $(xml_sources) doc-pdf-docbook-dirs
+
+stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook
        @echo "Generating pdf dblatex files..."
-       dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml
-doc-texinfo-docbook: doc-xml-single-docbook ${docbook_outdir}/texinfo
+       dblatex $(DBLATEX_FLAGS) -o ${manual_pdf} \
+       ${top_srcdir}/doc/xml/spine.xml
+       $(STAMP) stamp-pdf-docbook
+
+doc-pdf-docbook: stamp-pdf-docbook
+
+stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo
        @echo "Generating texinfo files..."
-       db2x_docbook2texi $(DB2TEXI_FLAGS) ${manual_xml}
-doc-html-performance:
+       db2x_docbook2texi $(DB2TEXI_FLAGS) ${set_xml}
+       mv libstdc++-manual.texi ${manual_texi}
+       $(STAMP) stamp-texinfo-docbook
+
+stamp-info-docbook: stamp-texinfo-docbook
+       @echo "Generating info files..."
+       $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi}
+       $(STAMP) stamp-info-docbook
+
+doc-texinfo-docbook: stamp-texinfo-docbook
+
+doc-info-docbook: stamp-info-docbook
+stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
+       @echo "Generating epub files..."
+       if [ ! -d "${docbook_outdir}/images" ]; then \
+         $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
+       fi
+       $(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
+doc-svg-performance: ${docbook_outdir}/xml
        -@(chmod + ${doc_performance_script}; \
-       ${doc_performance_script} ${top_srcdir} \
+       ${doc_performance_script} \
+       ${top_srcdir}/testsuite/data/make_graph_test_infos.xml \
        ${glibcxx_builddir}/testsuite \
-       ${top_srcdir}/testsuite/data/make_graph_htmls.xml \
-       ${top_srcdir}/testsuite/data/make_graph_test_infos.xml local g++)
+       ${glibcxx_builddir}/doc/docbook/xml/images)
 
 .PHONY: doc-doxygen-html doc-doxygen-man doc-performance
 
 # To remove directories.
 clean-local:
-       rm -rf man html pdf fo xml doxygen docbook stamp* ./libstdc++-* db2t*
+       rm -rf man html pdf fo xml doxygen docbook ./libstdc++-* db2t*
 
 # 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.