From: bkoz Date: Fri, 31 Dec 2010 22:20:22 +0000 (+0000) Subject: 2010-12-31 Benjamin Kosnik X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=e95f17723fb9794b967219e107500c1db6011453 2010-12-31 Benjamin Kosnik * scripts/run_doxygen: Allow doxygen 1.7.1 again. * doc/xml/manual/build_hacking.xml: Update. * doc/xml/images/confdeps.dot: Same. * doc/xml/images/confdeps.png: Same. * configure.ac: Define BUILD_INFO, BUILD_XML, BUILD_HTML, BUILD_MAN, BUILD_PDF, BUILD_EPUB conditionally. * Makefile.am (xml, html, pdf, man, info, pd, dvi, epub): Define, and install rules. * doc/Makefile.am: Same. Add stamp rules. (doc-epub-docbook): Add. (stamp-xml-single-docbook): Make set too. * configure: Regenerate. * Makefile.in: Same. * doc/Makefile.in: Same. * include/Makefile.in: Same. * libsupc++/Makefile.in: Same. * po/Makefile.in: Same. * python/Makefile.in: Same. * src/Makefile.in: Same. * testsuite/Makefile.in: Same. * aclocal.m4: Same. 2010-12-31 Benjamin Kosnik * doc/doxygen/user.cfg.in: Disable PDF_HYPERLINKS. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168382 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6feb439d852..82831e77ec4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,33 @@ +2010-12-31 Benjamin Kosnik + + * scripts/run_doxygen: Allow doxygen 1.7.1 again. + + * doc/xml/manual/build_hacking.xml: Update. + * doc/xml/images/confdeps.dot: Same. + * doc/xml/images/confdeps.png: Same. + + * configure.ac: Define BUILD_INFO, BUILD_XML, BUILD_HTML, + BUILD_MAN, BUILD_PDF, BUILD_EPUB conditionally. + * Makefile.am (xml, html, pdf, man, info, pd, dvi, epub): Define, + and install rules. + * doc/Makefile.am: Same. Add stamp rules. + (doc-epub-docbook): Add. + (stamp-xml-single-docbook): Make set too. + * configure: Regenerate. + * Makefile.in: Same. + * doc/Makefile.in: Same. + * include/Makefile.in: Same. + * libsupc++/Makefile.in: Same. + * po/Makefile.in: Same. + * python/Makefile.in: Same. + * src/Makefile.in: Same. + * testsuite/Makefile.in: Same. + * aclocal.m4: Same. + +2010-12-31 Benjamin Kosnik + + * doc/doxygen/user.cfg.in: Disable PDF_HYPERLINKS. + 2010-12-19 John David Anglin PR libstdc++/46869 diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index c7a22aaa33c..f1b5b078790 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the toplevel directory of the GNU C++ Standard library. ## -## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008, 2009 +## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008, 2009, 2010 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -26,19 +26,105 @@ include $(top_srcdir)/fragment.am if GLIBCXX_HOSTED hosted_source = doc src po testsuite endif + ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. ## Note that python must come after src. SUBDIRS = include libsupc++ $(hosted_source) python ACLOCAL_AMFLAGS = -I . -I .. -I ../config -# Handy forwarding targets. +# Testsuite/check forwarding targets. check-%: cd testsuite && $(MAKE) $@ +# Documentation forwarding targets. doc-%: cd doc && $(MAKE) $@ +# Documentation conditionals for output. +if BUILD_XML +STAMP_XML = doc-xml +STAMP_INSTALL_XML = doc-install-xml +else +STAMP_XML = +STAMP_INSTALL_XML = +endif + +if BUILD_HTML +STAMP_HTML = doc-html +STAMP_INSTALL_HTML = doc-install-html +else +STAMP_HTML = +STAMP_INSTALL_HTML = +endif + +if BUILD_MAN +STAMP_MAN = doc-man +STAMP_INSTALL_MAN = doc-install-man +else +STAMP_MAN = +STAMP_INSTALL_MAN = +endif + +if BUILD_PDF +STAMP_PDF = doc-pdf +STAMP_INSTALL_PDF = doc-install-pdf +else +STAMP_PDF = +STAMP_INSTALL_PDF = +endif + +if BUILD_EPUB +STAMP_EPUB = doc-epub +STAMP_INSTALL_EPUB = doc-install-epub +else +STAMP_EPUB = doc-epub +STAMP_INSTALL_EPUB = doc-install-epub +endif + +# Documentation primary rules. +# +# xml: +# html: +# pdf: +# man: +# info: +# ps: +# dvi: +# epub: +# install-xml: +# install-html: +# install-pdf: +# install-man: +# install-info: +# install-ps: +# install-dvi: +# install-epub: + +xml: $(STAMP_XML) +install-xml: $(STAMP_INSTALL_XML) + +html: $(STAMP_HTML) +install-html: $(STAMP_INSTALL_HTML) + +man: $(STAMP_MAN) +install-man: $(STAMP_INSTALL_MAN) + +pdf: $(STAMP_PDF) +install-pdf: $(STAMP_INSTALL_PDF) + +epub: $(STAMP_EPUB) +install-epub: $(STAMP_INSTALL_EPUB) + +info: +install-info: + +ps: +install-ps: + +dvi: +install-dvi: + # Multilib support. MAKEOVERRIDES= diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 837c5d272d4..49e83d6019f 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -42,7 +42,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am README ChangeLog \ $(top_srcdir)/scripts/extract_symvers.in subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -131,8 +132,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -182,7 +187,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -195,6 +202,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -293,6 +302,28 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) @GLIBCXX_HOSTED_TRUE@hosted_source = doc src po testsuite SUBDIRS = include libsupc++ $(hosted_source) python ACLOCAL_AMFLAGS = -I . -I .. -I ../config +@BUILD_XML_FALSE@STAMP_XML = + +# 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 # Multilib support. MAKEOVERRIDES = @@ -566,42 +597,24 @@ distclean: distclean-multi distclean-recursive distclean-am: clean-am distclean-generic distclean-hdr \ distclean-libtool distclean-tags -dvi: dvi-recursive - dvi-am: -html: html-recursive - html-am: -info: info-recursive - info-am: install-data-am: -install-dvi: install-dvi-recursive - install-dvi-am: install-exec-am: install-multi -install-html: install-html-recursive - install-html-am: -install-info: install-info-recursive - install-info-am: -install-man: - -install-pdf: install-pdf-recursive - install-pdf-am: -install-ps: install-ps-recursive - install-ps-am: installcheck-am: @@ -616,12 +629,8 @@ mostlyclean: mostlyclean-multi mostlyclean-recursive mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-recursive - pdf-am: -ps: ps-recursive - ps-am: uninstall-am: @@ -647,13 +656,57 @@ uninstall-am: pdf-am ps ps-am tags tags-recursive uninstall uninstall-am -# Handy forwarding targets. +# Testsuite/check forwarding targets. check-%: cd testsuite && $(MAKE) $@ +# Documentation forwarding targets. doc-%: cd doc && $(MAKE) $@ +# Documentation primary rules. +# +# xml: +# html: +# pdf: +# man: +# info: +# ps: +# dvi: +# epub: +# install-xml: +# install-html: +# install-pdf: +# install-man: +# install-info: +# install-ps: +# install-dvi: +# install-epub: + +xml: $(STAMP_XML) +install-xml: $(STAMP_INSTALL_XML) + +html: $(STAMP_HTML) +install-html: $(STAMP_INSTALL_HTML) + +man: $(STAMP_MAN) +install-man: $(STAMP_INSTALL_MAN) + +pdf: $(STAMP_PDF) +install-pdf: $(STAMP_INSTALL_PDF) + +epub: $(STAMP_EPUB) +install-epub: $(STAMP_INSTALL_EPUB) + +info: +install-info: + +ps: +install-ps: + +dvi: +install-dvi: + # All the machinations with string instantiations messes up the # automake-generated TAGS rule. Make a simple one here. TAGS: tags-recursive $(LISP) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 55b6cdf262c..60b7ccb5912 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -654,6 +654,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/acx.m4]) m4_include([../config/enable.m4]) m4_include([../config/futex.m4]) m4_include([../config/iconv.m4]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 85ac9494e21..bde823d7013 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -618,6 +618,26 @@ CPU_DEFINES_SRCDIR ATOMIC_FLAGS ATOMIC_WORD_SRCDIR ATOMICITY_SRCDIR +BUILD_EPUB_FALSE +BUILD_EPUB_TRUE +DBTOEPUB +RUBY +BUILD_PDF_FALSE +BUILD_PDF_TRUE +PDFLATEX +DBLATEX +BUILD_MAN_FALSE +BUILD_MAN_TRUE +BUILD_HTML_FALSE +BUILD_HTML_TRUE +BUILD_XML_FALSE +BUILD_XML_TRUE +XMLLINT +XSLTPROC +DOT +DOXYGEN +BUILD_INFO_FALSE +BUILD_INFO_TRUE baseline_dir GLIBCXX_LDBL_COMPAT_FALSE GLIBCXX_LDBL_COMPAT_TRUE @@ -11470,7 +11490,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11473 "configure" +#line 11493 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11576,7 +11596,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11579 "configure" +#line 11599 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14938,7 +14958,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14941 "configure" +#line 14961 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15306,7 +15326,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15309 "configure" +#line 15329 "configure" int main() { typedef bool atomic_type; @@ -15343,7 +15363,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15346 "configure" +#line 15366 "configure" int main() { typedef short atomic_type; @@ -15380,7 +15400,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15383 "configure" +#line 15403 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15418,7 +15438,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15421 "configure" +#line 15441 "configure" int main() { typedef long long atomic_type; @@ -15494,7 +15514,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15497 "configure" +#line 15517 "configure" int main() { _Decimal32 d1; @@ -58934,6 +58954,472 @@ done +# Define documentation rules conditionally. + +# See if makeinfo has been installed and is modern enough +# that we can use it. + + # Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_MAKEINFO+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MAKEINFO="makeinfo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MAKEINFO=$ac_cv_prog_MAKEINFO +if test -n "$MAKEINFO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5 +$as_echo "$MAKEINFO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -n "$MAKEINFO"; then + # Found it, now check the version. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for modern makeinfo" >&5 +$as_echo_n "checking for modern makeinfo... " >&6; } +if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_prog_version=`eval $MAKEINFO --version 2>&1 | + sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` + + case $ac_prog_version in + '') gcc_cv_prog_makeinfo_modern=no;; + 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;; + *) gcc_cv_prog_makeinfo_modern=no;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_prog_makeinfo_modern" >&5 +$as_echo "$gcc_cv_prog_makeinfo_modern" >&6; } + else + gcc_cv_prog_makeinfo_modern=no + fi + if test $gcc_cv_prog_makeinfo_modern = no; then + MAKEINFO="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing makeinfo" + fi + + if test $gcc_cv_prog_makeinfo_modern = "yes"; then + BUILD_INFO_TRUE= + BUILD_INFO_FALSE='#' +else + BUILD_INFO_TRUE='#' + BUILD_INFO_FALSE= +fi + + +# Check for doxygen +# Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DOXYGEN+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DOXYGEN"; then + ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DOXYGEN="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DOXYGEN" && ac_cv_prog_DOXYGEN="no" +fi +fi +DOXYGEN=$ac_cv_prog_DOXYGEN +if test -n "$DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 +$as_echo "$DOXYGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DOT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DOT"; then + ac_cv_prog_DOT="$DOT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DOT="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DOT" && ac_cv_prog_DOT="no" +fi +fi +DOT=$ac_cv_prog_DOT +if test -n "$DOT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5 +$as_echo "$DOT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + +# Check for docbook +# Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_XSLTPROC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$XSLTPROC"; then + ac_cv_prog_XSLTPROC="$XSLTPROC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_XSLTPROC="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_XSLTPROC" && ac_cv_prog_XSLTPROC="no" +fi +fi +XSLTPROC=$ac_cv_prog_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "xmllint", so it can be a program name with args. +set dummy xmllint; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_XMLLINT+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$XMLLINT"; then + ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_XMLLINT="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_XMLLINT" && ac_cv_prog_XMLLINT="no" +fi +fi +XMLLINT=$ac_cv_prog_XMLLINT +if test -n "$XMLLINT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 +$as_echo "$XMLLINT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION" >&5 +$as_echo_n "checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION... " >&6; } +if test "${ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION"; then + ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION=yes +else + ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" >&5 +$as_echo "$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" >&6; } +if test "x$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_VERSION" = x""yes; then : + glibcxx_stylesheets=yes +else + glibcxx_stylesheets=no +fi + + +# Check for xml/html dependencies. + if test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && + test $glibcxx_stylesheets = "yes"; then + BUILD_XML_TRUE= + BUILD_XML_FALSE='#' +else + BUILD_XML_TRUE='#' + BUILD_XML_FALSE= +fi + + + if test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && + test $glibcxx_stylesheets = "yes"; then + BUILD_HTML_TRUE= + BUILD_HTML_FALSE='#' +else + BUILD_HTML_TRUE='#' + BUILD_HTML_FALSE= +fi + + +# Check for man dependencies. + if test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes"; then + BUILD_MAN_TRUE= + BUILD_MAN_FALSE='#' +else + BUILD_MAN_TRUE='#' + BUILD_MAN_FALSE= +fi + + +# Check for pdf/epub dependencies. +# Extract the first word of "dblatex", so it can be a program name with args. +set dummy dblatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DBLATEX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DBLATEX"; then + ac_cv_prog_DBLATEX="$DBLATEX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DBLATEX="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DBLATEX" && ac_cv_prog_DBLATEX="no" +fi +fi +DBLATEX=$ac_cv_prog_DBLATEX +if test -n "$DBLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBLATEX" >&5 +$as_echo "$DBLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "pdflatex", so it can be a program name with args. +set dummy pdflatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_PDFLATEX+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PDFLATEX"; then + ac_cv_prog_PDFLATEX="$PDFLATEX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PDFLATEX="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_PDFLATEX" && ac_cv_prog_PDFLATEX="no" +fi +fi +PDFLATEX=$ac_cv_prog_PDFLATEX +if test -n "$PDFLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5 +$as_echo "$PDFLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test $ac_cv_prog_DBLATEX = "yes" && + test $ac_cv_prog_PDFLATEX = "yes"; then + BUILD_PDF_TRUE= + BUILD_PDF_FALSE='#' +else + BUILD_PDF_TRUE='#' + BUILD_PDF_FALSE= +fi + + +# Extract the first word of "ruby", so it can be a program name with args. +set dummy ruby; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RUBY+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RUBY"; then + ac_cv_prog_RUBY="$RUBY" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RUBY="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_RUBY" && ac_cv_prog_RUBY="no" +fi +fi +RUBY=$ac_cv_prog_RUBY +if test -n "$RUBY"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5 +$as_echo "$RUBY" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "dbtoepubm", so it can be a program name with args. +set dummy dbtoepubm; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DBTOEPUB+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DBTOEPUB"; then + ac_cv_prog_DBTOEPUB="$DBTOEPUB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DBTOEPUB="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DBTOEPUB" && ac_cv_prog_DBTOEPUB="no" +fi +fi +DBTOEPUB=$ac_cv_prog_DBTOEPUB +if test -n "$DBTOEPUB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 +$as_echo "$DBTOEPUB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test $ac_cv_prog_RUBY = "yes" && + test $ac_cv_prog_DBTOEPUB = "yes"; then + BUILD_EPUB_TRUE= + BUILD_EPUB_FALSE='#' +else + BUILD_EPUB_TRUE='#' + BUILD_EPUB_FALSE= +fi + + + # Propagate the target-specific source directories through the build chain. ATOMICITY_SRCDIR=config/${atomicity_dir} ATOMIC_WORD_SRCDIR=config/${atomic_word_dir} @@ -59507,6 +59993,30 @@ if test -z "${GLIBCXX_LDBL_COMPAT_TRUE}" && test -z "${GLIBCXX_LDBL_COMPAT_FALSE as_fn_error "conditional \"GLIBCXX_LDBL_COMPAT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then + as_fn_error "conditional \"BUILD_INFO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_XML_TRUE}" && test -z "${BUILD_XML_FALSE}"; then + as_fn_error "conditional \"BUILD_XML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_HTML_TRUE}" && test -z "${BUILD_HTML_FALSE}"; then + as_fn_error "conditional \"BUILD_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_MAN_TRUE}" && test -z "${BUILD_MAN_FALSE}"; then + as_fn_error "conditional \"BUILD_MAN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_PDF_TRUE}" && test -z "${BUILD_PDF_FALSE}"; then + as_fn_error "conditional \"BUILD_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${BUILD_EPUB_TRUE}" && test -z "${BUILD_EPUB_FALSE}"; then + as_fn_error "conditional \"BUILD_EPUB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index c3a5bdc0903..a70bbcf9e74 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -232,7 +232,7 @@ else AC_DEFINE(HAVE_HYPOT) # GLIBCXX_CHECK_STDLIB_SUPPORT - AC_DEFINE(HAVE_STRTOF) + AC_DEFINE(HAVE_STRTOF) AC_DEFINE(HAVE_ACOSF) AC_DEFINE(HAVE_ASINF) @@ -327,6 +327,59 @@ GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes) # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. GLIBCXX_CONFIGURE_TESTSUITE +# Define documentation rules conditionally. + +# See if makeinfo has been installed and is modern enough +# that we can use it. +ACX_CHECK_PROG_VER([MAKEINFO], [makeinfo], [--version], + [GNU texinfo.* \([0-9][0-9.]*\)], + [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) +AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes") + +# Check for doxygen +AC_CHECK_PROG([DOXYGEN], doxygen, yes, no) +AC_CHECK_PROG([DOT], dot, yes, no) + +# Check for docbook +AC_CHECK_PROG([XSLTPROC], xsltproc, yes, no) +AC_CHECK_PROG([XMLLINT], xmllint, yes, no) +AC_CHECK_FILE([/usr/share/sgml/docbook/xsl-ns-stylesheets/VERSION], + [glibcxx_stylesheets=yes], [glibcxx_stylesheets=no]) + +# Check for xml/html dependencies. +AM_CONDITIONAL(BUILD_XML, + test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && + test $glibcxx_stylesheets = "yes") + +AM_CONDITIONAL(BUILD_HTML, + test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && + test $glibcxx_stylesheets = "yes") + +# Check for man dependencies. +AM_CONDITIONAL(BUILD_MAN, + test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes") + +# Check for pdf/epub dependencies. +AC_CHECK_PROG([DBLATEX], dblatex, yes, no) +AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no) +AM_CONDITIONAL(BUILD_PDF, + test $ac_cv_prog_DBLATEX = "yes" && + test $ac_cv_prog_PDFLATEX = "yes") + +AC_CHECK_PROG([RUBY], ruby, yes, no) +AC_CHECK_PROG([DBTOEPUB], dbtoepubm, yes, no) +AM_CONDITIONAL(BUILD_EPUB, + test $ac_cv_prog_RUBY = "yes" && + test $ac_cv_prog_DBTOEPUB = "yes") + + # Propagate the target-specific source directories through the build chain. ATOMICITY_SRCDIR=config/${atomicity_dir} ATOMIC_WORD_SRCDIR=config/${atomic_word_dir} @@ -348,7 +401,7 @@ AC_SUBST(ERROR_CONSTANTS_SRCDIR) #AC_SUBST(GLIBCXX_IS_NATIVE) #AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes) GLIBCXX_EVALUATE_CONDITIONALS - + AC_CACHE_SAVE if test ${multilib} = yes; then diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 06ce75a3095..012593d6e05 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -24,90 +24,240 @@ include $(top_srcdir)/fragment.am # Documentation Overview # -# There are two main source materials for libstdc++ documentation. +# 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 docbook markup in +# 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. - -# Default rules. +# A third and more obscure option deals with charting performance +# tests, and should be considered experimental. + +# Documentation conditionals for output. +if BUILD_XML +STAMP_XML = doc-xml +STAMP_INSTALL_XML = doc-install-xml +else +STAMP_XML = +STAMP_INSTALL_XML = +endif + +if BUILD_HTML +STAMP_HTML = doc-html +STAMP_INSTALL_HTML = doc-install-html +else +STAMP_HTML = +STAMP_INSTALL_HTML = +endif + +if BUILD_MAN +STAMP_MAN = doc-man +STAMP_INSTALL_MAN = doc-install-man +else +STAMP_MAN = +STAMP_INSTALL_MAN = +endif + +if BUILD_PDF +STAMP_PDF = doc-pdf +STAMP_INSTALL_PDF = doc-install-pdf +else +STAMP_PDF = +STAMP_INSTALL_PDF = +endif + +if BUILD_EPUB +STAMP_EPUB = doc-epub +STAMP_INSTALL_EPUB = doc-install-epub +else +STAMP_EPUB = doc-epub +STAMP_INSTALL_EPUB = doc-install-epub +endif + +# Documentation primary rules. # -# Point to best sub-rule for the requested documentation target, -# create, and then copy into toplevel directory with standardized names +# xml: +# html: +# pdf: +# man: +# info: +# ps: +# dvi: +# epub: +# install-xml: +# install-html: +# install-pdf: +# install-man: +# install-info: +# install-ps: +# install-dvi: +# install-epub: + +xml: $(STAMP_XML) +install-xml: $(STAMP_INSTALL_XML) + +html: $(STAMP_HTML) +install-html: $(STAMP_INSTALL_HTML) + +man: $(STAMP_MAN) +install-man: $(STAMP_INSTALL_MAN) + +pdf: $(STAMP_PDF) +install-pdf: $(STAMP_INSTALL_PDF) + +epub: $(STAMP_EPUB) +install-epub: $(STAMP_INSTALL_EPUB) + +info: +install-info: + +ps: +install-ps: + +dvi: +install-dvi: + + +# 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@" +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} + # 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 +htmldir="$(DESTDIR)@docdir@" +stamp-html: stamp-html-docbook stamp-html-doxygen + $(STAMP) stamp-html -# MAN -doc-man: doc-man-doxygen - cp -R ${doxygen_outdir}/man ./libstdc++-api.man +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; # PDF -doc-pdf: doc-pdf-docbook doc-pdf-doxygen - cp ${docbook_outdir}/pdf/libstdc++-manual.pdf . - cp ${doxygen_outdir}/pdf/libstdc++-api.pdf . +pdfdir="$(DESTDIR)@docdir@" +stamp-pdf: stamp-pdf-docbook stamp-pdf-doxygen + $(STAMP) stamp-pdf -# TEXINFO -doc-texinfo: doc-texinfo-docbook +doc-pdf: stamp-pdf -# XML -doc-xml: doc-xml-single-docbook doc-xml-single-doxygen - cp ${manual_xml} . - cp ${api_xml} . +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} + +# MAN +mandir="$(DESTDIR)@mandir@" +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} + +# TEXINFO,INFO +infodir="$(DESTDIR)@infodir@" +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} + +# EPUB +# Assumes ruby installed +epubdir="$(DESTDIR)@docdir@" +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} # 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 +doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf +api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf -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) +${doxygen_outdir}/xml: + mkdir -p ${doxygen_outdir}/xml -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) +${doxygen_outdir}/html: + mkdir -p ${doxygen_outdir}/html -doc-xml-doxygen: +${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) + $(STAMP) stamp-xml-doxygen -api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml -doc-xml-single-doxygen: doc-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 + +stamp-html-doxygen: ${doxygen_outdir}/html + -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ + builddir=`cd ..; ${PWD_COMMAND}`; \ + ${SHELL} ${doxygen_script} \ + --host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES) + $(STAMP) stamp-html-doxygen -doc-latex-doxygen: +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 # 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. -doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf -api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf - -${doxygen_outdir}/pdf: - mkdir -p ${doxygen_outdir}/pdf - -doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf +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 \ @@ -117,25 +267,22 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf echo "... error"; \ 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 + +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 -stamp-latex-doxygen: - @if [ ! -f stamp-latex-doxygen ]; then \ - $(MAKE) doc-latex-doxygen; \ - fi - $(STAMP) stamp-latex-doxygen # Docbook configuration. # Assumes @@ -144,7 +291,6 @@ stamp-latex-doxygen: # pdflatex # docbook-style-xsl # emacs-nxml-mode -# xmlto passivetex docbook_outdir = ${glibcxx_builddir}/doc/docbook xml_dir = ${glibcxx_srcdir}/doc/xml @@ -220,11 +366,18 @@ xml_noinst = \ XSLTPROC = xsltproc XSLTPROC_FLAGS = --nonet --xinclude +#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets 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_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 +#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/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 + +${docbook_outdir}/epub: + mkdir -p ${docbook_outdir}/epub ${docbook_outdir}/fo: mkdir -p ${docbook_outdir}/fo @@ -243,62 +396,106 @@ ${docbook_outdir}/xml: # 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 --nsclean --postvalid --nowarning --nonet +#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout 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) +XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata +XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS) doc-xml-validate-docbook: $(xml_sources) @echo "Generating XML validation log..." - $(XMLLINT) $(XMLLINT_FLAGS) ${top_srcdir}/doc/xml/spine.xml + $(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml # 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 -doc-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml +set_xml = ${docbook_outdir}/xml/libstdc++-set-single.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}; + if [ ! -d "${docbook_outdir}/xml/images" ]; then \ + $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/xml/; \ + fi + $(STAMP) stamp-xml-single-docbook + +doc-xml-single-docbook: stamp-xml-single-docbook # HTML, index plus chapters -doc-html-docbook: $(xml_sources) ${docbook_outdir}/html +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 + $(STAMP) stamp-html-docbook + +doc-html-docbook: stamp-html-docbook # HTML, all one page manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html -doc-html-single-docbook: $(xml_sources) ${docbook_outdir}/html +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 + $(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 \ $(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-fo-docbook + +doc-fo-docbook: stamp-fo-docbook # PDF, via dblatex manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf} -doc-pdf-docbook: doc-pdf-dblatex-docbook - -doc-pdf-dblatex-docbook: $(xml_sources) ${docbook_outdir}/pdf +stamp-pdf-docbook: $(xml_sources) ${docbook_outdir}/pdf @echo "Generating pdf dblatex files..." dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml + $(STAMP) stamp-pdf-docbook + +doc-pdf-docbook: stamp-pdf-docbook -# 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" \ --string-param directory-category="GNU C++ Library" \ --string-param explicit-node-names=true -doc-texinfo-docbook: doc-xml-single-docbook ${docbook_outdir}/texinfo + +stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo @echo "Generating texinfo files..." - db2x_docbook2texi $(DB2TEXI_FLAGS) ${manual_xml} + 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 + +# EPUB, via dbtoepub + ruby +manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub +stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub + @echo "Generating epub files..." + ${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml} + $(STAMP) stamp-epub-docbook + +doc-epub-docbook: stamp-epub-docbook # Performance doc and graph configuration. @@ -316,8 +513,8 @@ doc-html-performance: .PHONY: doc-doxygen-html doc-doxygen-man doc-performance # By adding these files here, automake will remove them for 'make clean' -CLEANFILES = *.log +CLEANFILES = *.log stamp* # 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* diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index e9e31e2534d..8b6934a1f2d 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -38,7 +38,8 @@ 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)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -169,6 +176,10 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ + +# Validate existing XML structure. +XMLLINT = xmllint +XSLTPROC = xsltproc abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -211,9 +222,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,11 +236,15 @@ 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@ @@ -264,18 +283,56 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) +@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. doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf @@ -286,7 +343,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 = \ @@ -359,27 +415,29 @@ xml_noinst = \ ${xml_dir}/chapter.txml \ ${xml_dir}/class.txml -XSLTPROC = xsltproc XSLTPROC_FLAGS = --nonet --xinclude +#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets 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_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 +#XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml/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 +#LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet +#LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout 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) +XMLLINT_FLAGS = --xinclude --nsclean --c14n --noent --noblanks --nocdata +XMLLINT_VALID_FLAGS = $(LINT_FLAGS) $(SCHEMA_FLAGS) # 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 # HTML, all one page manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html @@ -388,7 +446,10 @@ manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf} -# 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 +457,16 @@ DB2TEXI_FLAGS = \ --string-param explicit-node-names=true +# EPUB, via dbtoepub + ruby +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 # By adding these files here, automake will remove them for 'make clean' -CLEANFILES = *.log +CLEANFILES = *.log stamp* all: all-am .SUFFIXES: @@ -486,42 +550,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 +580,8 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool -pdf: pdf-am - pdf-am: -ps: ps-am - ps-am: uninstall-am: @@ -558,76 +600,157 @@ uninstall-am: mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am -# 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/. +# Documentation primary rules. # -# A third and more obscure option deals with charting -# performance tests, and should be considered experimental. +# xml: +# html: +# pdf: +# man: +# info: +# ps: +# dvi: +# epub: +# install-xml: +# install-html: +# install-pdf: +# install-man: +# install-info: +# install-ps: +# install-dvi: +# install-epub: -# Default rules. -# -# Point to best sub-rule for the requested documentation target, -# create, and then copy into toplevel directory with standardized names -# and layouts. +xml: $(STAMP_XML) +install-xml: $(STAMP_INSTALL_XML) -# 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 +html: $(STAMP_HTML) +install-html: $(STAMP_INSTALL_HTML) -# MAN -doc-man: doc-man-doxygen - cp -R ${doxygen_outdir}/man ./libstdc++-api.man +man: $(STAMP_MAN) +install-man: $(STAMP_INSTALL_MAN) -# PDF -doc-pdf: doc-pdf-docbook doc-pdf-doxygen - cp ${docbook_outdir}/pdf/libstdc++-manual.pdf . - cp ${doxygen_outdir}/pdf/libstdc++-api.pdf . +pdf: $(STAMP_PDF) +install-pdf: $(STAMP_INSTALL_PDF) -# TEXINFO -doc-texinfo: doc-texinfo-docbook +epub: $(STAMP_EPUB) +install-epub: $(STAMP_INSTALL_EPUB) -# XML -doc-xml: doc-xml-single-docbook doc-xml-single-doxygen - cp ${manual_xml} . - cp ${api_xml} . +info: +install-info: -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) +ps: +install-ps: -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) +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 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-xml-doxygen: +doc-install-epub: doc-epub + test -z ${epubdir} || $(mkinstalldirs) ${epubdir} + $(INSTALL_DATA) ${manual_epub} ${epubdir} + +${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. +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 \ @@ -637,25 +760,24 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf echo "... error"; \ 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 ${docbook_outdir}/fo: mkdir -p ${docbook_outdir}/fo @@ -673,35 +795,71 @@ ${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 + $(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.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}; + if [ ! -d "${docbook_outdir}/xml/images" ]; then \ + $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/xml/; \ + fi + $(STAMP) stamp-xml-single-docbook + +doc-xml-single-docbook: stamp-xml-single-docbook # HTML, index plus chapters -doc-html-docbook: $(xml_sources) ${docbook_outdir}/html +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 + $(STAMP) stamp-html-docbook + +doc-html-docbook: stamp-html-docbook +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 + $(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 \ $(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml -doc-pdf-docbook: doc-pdf-dblatex-docbook + $(STAMP) stamp-fo-docbook -doc-pdf-dblatex-docbook: $(xml_sources) ${docbook_outdir}/pdf +doc-fo-docbook: stamp-fo-docbook +stamp-pdf-docbook: $(xml_sources) ${docbook_outdir}/pdf @echo "Generating pdf dblatex files..." dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml -doc-texinfo-docbook: doc-xml-single-docbook ${docbook_outdir}/texinfo + $(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} + 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..." + ${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml} + $(STAMP) stamp-epub-docbook + +doc-epub-docbook: stamp-epub-docbook doc-html-performance: -@(chmod + ${doc_performance_script}; \ ${doc_performance_script} ${top_srcdir} \ @@ -713,7 +871,7 @@ doc-html-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. diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index c9b2df899af..be7119ca821 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -1304,7 +1304,7 @@ LATEX_HEADER = # contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = YES +PDF_HYPERLINKS = NO # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of # plain latex in the generated Makefile. Set this option to YES to get a diff --git a/libstdc++-v3/doc/xml/images/confdeps.dot b/libstdc++-v3/doc/xml/images/confdeps.dot index a62d28ce9dd..047436eef2b 100644 --- a/libstdc++-v3/doc/xml/images/confdeps.dot +++ b/libstdc++-v3/doc/xml/images/confdeps.dot @@ -7,8 +7,10 @@ digraph v3conf { "configure" -> "configure.ac"; "configure" -> "crossconfig.m4"; "configure" -> "linkage.m4"; + "[*/]Makefile" -> "[*/]Makefile.in"; "[*/]Makefile.in" -> "Makefile.am"; "[*/]Makefile.in" -> "configure.ac"; + "config.h" -> "config.h.in" "config.h.in" -> "acconfig.h"; "config.h.in" -> "configure.ac"; } diff --git a/libstdc++-v3/doc/xml/manual/build_hacking.xml b/libstdc++-v3/doc/xml/manual/build_hacking.xml index 0746392a2b5..686ff31fc90 100644 --- a/libstdc++-v3/doc/xml/manual/build_hacking.xml +++ b/libstdc++-v3/doc/xml/manual/build_hacking.xml @@ -46,7 +46,7 @@ - + Dependency Graph Configure to Build Files diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 8548e9929ee..3260ef9bc20 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 7997daee21d..5ecbcf19701 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -40,7 +40,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(glibcxxinstall_HEADERS) subdir = libsupc++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -164,8 +165,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -215,7 +220,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -228,6 +235,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 38ba760023c..d460986e086 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = po ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 01110963b44..1c2668c4d6d 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = python ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -129,8 +130,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -180,7 +185,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -193,6 +200,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libstdc++-v3/scripts/run_doxygen b/libstdc++-v3/scripts/run_doxygen index 6b3ae4c3a59..23930929dfc 100644 --- a/libstdc++-v3/scripts/run_doxygen +++ b/libstdc++-v3/scripts/run_doxygen @@ -13,7 +13,7 @@ # We can check now that the version of doxygen is >= this variable. -DOXYVER=1.7.2 +DOXYVER=1.7.1 find_doxygen() { local -r v_required=`echo $DOXYVER | \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index dc47425cc5f..c0d621d32f8 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -163,8 +164,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -214,7 +219,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -227,6 +234,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 11995bfc957..86444c29169 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = testsuite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ @@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ +DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ +RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@