Commit b25e6b79 by Benjamin Kosnik Committed by Benjamin Kosnik

run_doxygen: Allow doxygen 1.7.1 again.

2010-12-31  Benjamin Kosnik  <bkoz@redhat.com>

	* 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  <bkoz@redhat.com>

	* doc/doxygen/user.cfg.in: Disable PDF_HYPERLINKS.

From-SVN: r168382
parent 132a5459
2010-12-31 Benjamin Kosnik <bkoz@redhat.com>
* 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 <bkoz@redhat.com>
* doc/doxygen/user.cfg.in: Disable PDF_HYPERLINKS.
2010-12-19 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2010-12-19 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
PR libstdc++/46869 PR libstdc++/46869
......
## Makefile for the toplevel directory of the GNU C++ Standard library. ## 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. ## Free Software Foundation, Inc.
## ##
## This file is part of the libstdc++ version 3 distribution. ## This file is part of the libstdc++ version 3 distribution.
...@@ -26,19 +26,105 @@ include $(top_srcdir)/fragment.am ...@@ -26,19 +26,105 @@ include $(top_srcdir)/fragment.am
if GLIBCXX_HOSTED if GLIBCXX_HOSTED
hosted_source = doc src po testsuite hosted_source = doc src po testsuite
endif endif
## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE.
## Note that python must come after src. ## Note that python must come after src.
SUBDIRS = include libsupc++ $(hosted_source) python SUBDIRS = include libsupc++ $(hosted_source) python
ACLOCAL_AMFLAGS = -I . -I .. -I ../config ACLOCAL_AMFLAGS = -I . -I .. -I ../config
# Handy forwarding targets. # Testsuite/check forwarding targets.
check-%: check-%:
cd testsuite && $(MAKE) $@ cd testsuite && $(MAKE) $@
# Documentation forwarding targets.
doc-%: doc-%:
cd doc && $(MAKE) $@ 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. # Multilib support.
MAKEOVERRIDES= MAKEOVERRIDES=
......
...@@ -42,7 +42,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am README ChangeLog \ ...@@ -42,7 +42,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am README ChangeLog \
$(top_srcdir)/scripts/extract_symvers.in $(top_srcdir)/scripts/extract_symvers.in
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -131,8 +132,12 @@ CXXFILT = @CXXFILT@ ...@@ -131,8 +132,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -182,7 +187,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -182,7 +187,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -195,6 +202,8 @@ USE_NLS = @USE_NLS@ ...@@ -195,6 +202,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
...@@ -293,6 +302,28 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) ...@@ -293,6 +302,28 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
@GLIBCXX_HOSTED_TRUE@hosted_source = doc src po testsuite @GLIBCXX_HOSTED_TRUE@hosted_source = doc src po testsuite
SUBDIRS = include libsupc++ $(hosted_source) python SUBDIRS = include libsupc++ $(hosted_source) python
ACLOCAL_AMFLAGS = -I . -I .. -I ../config 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. # Multilib support.
MAKEOVERRIDES = MAKEOVERRIDES =
...@@ -566,42 +597,24 @@ distclean: distclean-multi distclean-recursive ...@@ -566,42 +597,24 @@ distclean: distclean-multi distclean-recursive
distclean-am: clean-am distclean-generic distclean-hdr \ distclean-am: clean-am distclean-generic distclean-hdr \
distclean-libtool distclean-tags distclean-libtool distclean-tags
dvi: dvi-recursive
dvi-am: dvi-am:
html: html-recursive
html-am: html-am:
info: info-recursive
info-am: info-am:
install-data-am: install-data-am:
install-dvi: install-dvi-recursive
install-dvi-am: install-dvi-am:
install-exec-am: install-multi install-exec-am: install-multi
install-html: install-html-recursive
install-html-am: install-html-am:
install-info: install-info-recursive
install-info-am: install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am: install-pdf-am:
install-ps: install-ps-recursive
install-ps-am: install-ps-am:
installcheck-am: installcheck-am:
...@@ -616,12 +629,8 @@ mostlyclean: mostlyclean-multi mostlyclean-recursive ...@@ -616,12 +629,8 @@ mostlyclean: mostlyclean-multi mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
pdf-am: pdf-am:
ps: ps-recursive
ps-am: ps-am:
uninstall-am: uninstall-am:
...@@ -647,13 +656,57 @@ uninstall-am: ...@@ -647,13 +656,57 @@ uninstall-am:
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
# Handy forwarding targets. # Testsuite/check forwarding targets.
check-%: check-%:
cd testsuite && $(MAKE) $@ cd testsuite && $(MAKE) $@
# Documentation forwarding targets.
doc-%: doc-%:
cd doc && $(MAKE) $@ 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 # All the machinations with string instantiations messes up the
# automake-generated TAGS rule. Make a simple one here. # automake-generated TAGS rule. Make a simple one here.
TAGS: tags-recursive $(LISP) TAGS: tags-recursive $(LISP)
......
...@@ -654,6 +654,7 @@ AC_SUBST([am__tar]) ...@@ -654,6 +654,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar]) AC_SUBST([am__untar])
]) # _AM_PROG_TAR ]) # _AM_PROG_TAR
m4_include([../config/acx.m4])
m4_include([../config/enable.m4]) m4_include([../config/enable.m4])
m4_include([../config/futex.m4]) m4_include([../config/futex.m4])
m4_include([../config/iconv.m4]) m4_include([../config/iconv.m4])
......
...@@ -618,6 +618,26 @@ CPU_DEFINES_SRCDIR ...@@ -618,6 +618,26 @@ CPU_DEFINES_SRCDIR
ATOMIC_FLAGS ATOMIC_FLAGS
ATOMIC_WORD_SRCDIR ATOMIC_WORD_SRCDIR
ATOMICITY_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 baseline_dir
GLIBCXX_LDBL_COMPAT_FALSE GLIBCXX_LDBL_COMPAT_FALSE
GLIBCXX_LDBL_COMPAT_TRUE GLIBCXX_LDBL_COMPAT_TRUE
...@@ -11470,7 +11490,7 @@ else ...@@ -11470,7 +11490,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11473 "configure" #line 11493 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -11576,7 +11596,7 @@ else ...@@ -11576,7 +11596,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11579 "configure" #line 11599 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -14938,7 +14958,7 @@ fi ...@@ -14938,7 +14958,7 @@ fi
# #
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 14941 "configure" #line 14961 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
...@@ -15306,7 +15326,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } ...@@ -15306,7 +15326,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
# Fake what AC_TRY_COMPILE does. # Fake what AC_TRY_COMPILE does.
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15309 "configure" #line 15329 "configure"
int main() int main()
{ {
typedef bool atomic_type; typedef bool atomic_type;
...@@ -15343,7 +15363,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } ...@@ -15343,7 +15363,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15346 "configure" #line 15366 "configure"
int main() int main()
{ {
typedef short atomic_type; typedef short atomic_type;
...@@ -15380,7 +15400,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } ...@@ -15380,7 +15400,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15383 "configure" #line 15403 "configure"
int main() int main()
{ {
// NB: _Atomic_word not necessarily int. // NB: _Atomic_word not necessarily int.
...@@ -15418,7 +15438,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } ...@@ -15418,7 +15438,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15421 "configure" #line 15441 "configure"
int main() int main()
{ {
typedef long long atomic_type; typedef long long atomic_type;
...@@ -15494,7 +15514,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu ...@@ -15494,7 +15514,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
# unnecessary for this test. # unnecessary for this test.
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15497 "configure" #line 15517 "configure"
int main() int main()
{ {
_Decimal32 d1; _Decimal32 d1;
...@@ -58934,6 +58954,472 @@ done ...@@ -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. # Propagate the target-specific source directories through the build chain.
ATOMICITY_SRCDIR=config/${atomicity_dir} ATOMICITY_SRCDIR=config/${atomicity_dir}
ATOMIC_WORD_SRCDIR=config/${atomic_word_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 ...@@ -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. as_fn_error "conditional \"GLIBCXX_LDBL_COMPAT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi 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} : ${CONFIG_STATUS=./config.status}
ac_write_fail=0 ac_write_fail=0
...@@ -327,6 +327,59 @@ GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes) ...@@ -327,6 +327,59 @@ GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes)
# This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE.
GLIBCXX_CONFIGURE_TESTSUITE 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. # Propagate the target-specific source directories through the build chain.
ATOMICITY_SRCDIR=config/${atomicity_dir} ATOMICITY_SRCDIR=config/${atomicity_dir}
ATOMIC_WORD_SRCDIR=config/${atomic_word_dir} ATOMIC_WORD_SRCDIR=config/${atomic_word_dir}
......
...@@ -24,90 +24,240 @@ include $(top_srcdir)/fragment.am ...@@ -24,90 +24,240 @@ include $(top_srcdir)/fragment.am
# Documentation Overview # 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 # 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/. # doc/xml/.
# #
# A third and more obscure option deals with charting # A third and more obscure option deals with charting performance
# performance tests, and should be considered experimental. # tests, and should be considered experimental.
# Default rules. # 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, # xml:
# create, and then copy into toplevel directory with standardized names # 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. # 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 # HTML
doc-html: doc-html-docbook doc-html-doxygen htmldir="$(DESTDIR)@docdir@"
cp -R ${docbook_outdir}/html ./libstdc++-manual.html stamp-html: stamp-html-docbook stamp-html-doxygen
cp -R ${doxygen_outdir}/html ./libstdc++-api.html $(STAMP) stamp-html
# MAN doc-html: stamp-html
doc-man: doc-man-doxygen
cp -R ${doxygen_outdir}/man ./libstdc++-api.man 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 # PDF
doc-pdf: doc-pdf-docbook doc-pdf-doxygen pdfdir="$(DESTDIR)@docdir@"
cp ${docbook_outdir}/pdf/libstdc++-manual.pdf . stamp-pdf: stamp-pdf-docbook stamp-pdf-doxygen
cp ${doxygen_outdir}/pdf/libstdc++-api.pdf . $(STAMP) stamp-pdf
# TEXINFO doc-pdf: stamp-pdf
doc-texinfo: doc-texinfo-docbook
# XML doc-install-pdf: doc-pdf
doc-xml: doc-xml-single-docbook doc-xml-single-doxygen test -z ${pdfdir} || $(mkinstalldirs) ${pdfdir}
cp ${manual_xml} . $(INSTALL_DATA) ${docbook_outdir}/pdf/libstdc++-manual.pdf ${pdfdir}
cp ${api_xml} . $(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 # Doxygen configuration
# Assumes doxygen, graphviz (with dot), pdflatex installed # Assumes doxygen, graphviz (with dot), pdflatex installed
doxygen_script=${top_srcdir}/scripts/run_doxygen doxygen_script=${top_srcdir}/scripts/run_doxygen
doxygen_outdir = ${glibcxx_builddir}/doc/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: ${doxygen_outdir}/xml:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ mkdir -p ${doxygen_outdir}/xml
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES)
doc-man-doxygen: ${doxygen_outdir}/html:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ mkdir -p ${doxygen_outdir}/html
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
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}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \ builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \ ${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO) --host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO)
$(STAMP) stamp-xml-doxygen
api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml stamp-xml-single-doxygen: stamp-xml-doxygen
doc-xml-single-doxygen: doc-xml-doxygen
@echo "Generating doxygen xml single file..." @echo "Generating doxygen xml single file..."
$(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \ $(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \
${doxygen_outdir}/xml/index.xml > ${api_xml}; ${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}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \ builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \ ${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO) --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO)
$(STAMP) stamp-latex-doxygen
# Chance of loooooonnggg creation time on this rule. Iff this fails, # Chance of loooooonnggg creation time on this rule. Iff this fails,
# look at refman.log and see if TeX's memory is exhausted. Symptoms # 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, # include asking a wizard to enlarge capacity. If this is the case,
# find texmf.cnf and add a zero for pool_size, string_vacancies, # find texmf.cnf and add a zero for pool_size, string_vacancies,
# max_strings, and pool_free values. # max_strings, and pool_free values.
doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/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
-(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;) -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
echo "Generating doxygen pdf file..."; echo "Generating doxygen pdf file...";
if [ -f ${doxygen_pdf} ]; then \ if [ -f ${doxygen_pdf} ]; then \
...@@ -117,25 +267,22 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf ...@@ -117,25 +267,22 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
echo "... error"; \ echo "... error"; \
exit 12; \ exit 12; \
fi fi
stamp-pdf-doxygen:
@if [ ! -f stamp-pdf-doxygen ]; then \
$(MAKE) doc-pdf-doxygen; \
fi
$(STAMP) stamp-pdf-doxygen $(STAMP) stamp-pdf-doxygen
stamp-xml-doxygen: stamp-man-doxygen: ${doxygen_outdir}/man
@if [ ! -f stamp-xml-doxygen ]; then \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
$(MAKE) doc-xml-doxygen; \ builddir=`cd ..; ${PWD_COMMAND}`; \
$(MAKE) doc-xml-single-doxygen; \ ${SHELL} ${doxygen_script} \
fi --host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
$(STAMP) stamp-xml-doxygen $(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. # Docbook configuration.
# Assumes # Assumes
...@@ -144,7 +291,6 @@ stamp-latex-doxygen: ...@@ -144,7 +291,6 @@ stamp-latex-doxygen:
# pdflatex # pdflatex
# docbook-style-xsl # docbook-style-xsl
# emacs-nxml-mode # emacs-nxml-mode
# xmlto passivetex
docbook_outdir = ${glibcxx_builddir}/doc/docbook docbook_outdir = ${glibcxx_builddir}/doc/docbook
xml_dir = ${glibcxx_srcdir}/doc/xml xml_dir = ${glibcxx_srcdir}/doc/xml
...@@ -220,11 +366,18 @@ xml_noinst = \ ...@@ -220,11 +366,18 @@ xml_noinst = \
XSLTPROC = xsltproc XSLTPROC = xsltproc
XSLTPROC_FLAGS = --nonet --xinclude XSLTPROC_FLAGS = --nonet --xinclude
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl 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/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: ${docbook_outdir}/fo:
mkdir -p ${docbook_outdir}/fo mkdir -p ${docbook_outdir}/fo
...@@ -243,62 +396,106 @@ ${docbook_outdir}/xml: ...@@ -243,62 +396,106 @@ ${docbook_outdir}/xml:
# Validate existing XML structure. # Validate existing XML structure.
XMLLINT = xmllint XMLLINT = xmllint
#LINT_FLAGS = --debug --nonet --xinclude --nsclean --postvalid --nowarning #LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet
#LINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent #LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng #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 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) doc-xml-validate-docbook: $(xml_sources)
@echo "Generating XML validation log..." @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 # XML, all one page
# Some info on canonicalization # Some info on canonicalization
# http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html # 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-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..." @echo "Generating XML single..."
$(XMLLINT) --xinclude --noent --noblanks --nocdata --nsclean --c14n \ $(XMLLINT) $(XMLLINT_FLAGS) \
${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml} ${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 # HTML, index plus chapters
doc-html-docbook: $(xml_sources) ${docbook_outdir}/html stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
@echo "Generating html files..." @echo "Generating html files..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \
$(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml $(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml
$(STAMP) stamp-html-docbook
doc-html-docbook: stamp-html-docbook
# HTML, all one page # HTML, all one page
manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html 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..." @echo "Generating html single file..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \
$(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml
$(STAMP) stamp-html-single-docbook
doc-html-single-docbook: stamp-html-single-docbook
# FO # FO
doc-fo-docbook: $(xml_sources) ${docbook_outdir}/fo stamp-fo-docbook: $(xml_sources) ${docbook_outdir}/fo
@echo "Generating FO files..." @echo "Generating FO files..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \
$(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml $(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml
$(STAMP) stamp-fo-docbook
doc-fo-docbook: stamp-fo-docbook
# PDF, via dblatex # PDF, via dblatex
manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf} DBLATEX_FLAGS = --dump --verbose --pdf -o ${manual_pdf}
doc-pdf-docbook: doc-pdf-dblatex-docbook stamp-pdf-docbook: $(xml_sources) ${docbook_outdir}/pdf
doc-pdf-dblatex-docbook: $(xml_sources) ${docbook_outdir}/pdf
@echo "Generating pdf dblatex files..." @echo "Generating pdf dblatex files..."
dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml 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 = \ DB2TEXI_FLAGS = \
--encoding=utf-8//TRANSLIT \ --encoding=utf-8//TRANSLIT \
--string-param output-file="libstdc++-manual" \ --string-param output-file="libstdc++-manual" \
--string-param directory-category="GNU C++ Library" \ --string-param directory-category="GNU C++ Library" \
--string-param explicit-node-names=true --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..." @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. # Performance doc and graph configuration.
...@@ -316,8 +513,8 @@ doc-html-performance: ...@@ -316,8 +513,8 @@ doc-html-performance:
.PHONY: doc-doxygen-html doc-doxygen-man doc-performance .PHONY: doc-doxygen-html doc-doxygen-man doc-performance
# By adding these files here, automake will remove them for 'make clean' # By adding these files here, automake will remove them for 'make clean'
CLEANFILES = *.log CLEANFILES = *.log stamp*
# To remove directories. # To remove directories.
clean-local: 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*
...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = doc subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ ...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -169,6 +176,10 @@ USE_NLS = @USE_NLS@ ...@@ -169,6 +176,10 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
# Validate existing XML structure.
XMLLINT = xmllint
XSLTPROC = xsltproc
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
...@@ -211,9 +222,13 @@ host_alias = @host_alias@ ...@@ -211,9 +222,13 @@ host_alias = @host_alias@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
# HTML
htmldir = "$(DESTDIR)@docdir@"
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@
# TEXINFO,INFO
infodir = "$(DESTDIR)@infodir@"
install_sh = @install_sh@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
...@@ -221,11 +236,15 @@ libtool_VERSION = @libtool_VERSION@ ...@@ -221,11 +236,15 @@ libtool_VERSION = @libtool_VERSION@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
lt_host_flags = @lt_host_flags@ lt_host_flags = @lt_host_flags@
mandir = @mandir@
# MAN
mandir = "$(DESTDIR)@mandir@"
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
multi_basedir = @multi_basedir@ multi_basedir = @multi_basedir@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
# PDF
pdfdir = "$(DESTDIR)@docdir@"
port_specific_symbol_files = @port_specific_symbol_files@ port_specific_symbol_files = @port_specific_symbol_files@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
...@@ -264,18 +283,56 @@ WARN_CXXFLAGS = \ ...@@ -264,18 +283,56 @@ WARN_CXXFLAGS = \
# -I/-D flags to pass when compiling. # -I/-D flags to pass when compiling.
AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 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 # Doxygen configuration
# Assumes doxygen, graphviz (with dot), pdflatex installed # Assumes doxygen, graphviz (with dot), pdflatex installed
doxygen_script = ${top_srcdir}/scripts/run_doxygen doxygen_script = ${top_srcdir}/scripts/run_doxygen
doxygen_outdir = ${glibcxx_builddir}/doc/doxygen doxygen_outdir = ${glibcxx_builddir}/doc/doxygen
api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml 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 doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
...@@ -286,7 +343,6 @@ api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf ...@@ -286,7 +343,6 @@ api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf
# pdflatex # pdflatex
# docbook-style-xsl # docbook-style-xsl
# emacs-nxml-mode # emacs-nxml-mode
# xmlto passivetex
docbook_outdir = ${glibcxx_builddir}/doc/docbook docbook_outdir = ${glibcxx_builddir}/doc/docbook
xml_dir = ${glibcxx_srcdir}/doc/xml xml_dir = ${glibcxx_srcdir}/doc/xml
xml_sources_basic = \ xml_sources_basic = \
...@@ -359,27 +415,29 @@ xml_noinst = \ ...@@ -359,27 +415,29 @@ xml_noinst = \
${xml_dir}/chapter.txml \ ${xml_dir}/chapter.txml \
${xml_dir}/class.txml ${xml_dir}/class.txml
XSLTPROC = xsltproc
XSLTPROC_FLAGS = --nonet --xinclude XSLTPROC_FLAGS = --nonet --xinclude
#XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-stylesheets
XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets XSL_STYLE_DIR = /usr/share/sgml/docbook/xsl-ns-stylesheets
XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl 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/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
# Validate existing XML structure. XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl
XMLLINT = xmllint XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl
#LINT_FLAGS = --debug --nonet --xinclude --nsclean --postvalid --nowarning #LINT_FLAGS = --debug --xinclude --nsclean --postvalid --nowarning --nonet
#LINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent #LINT_FLAGS = --xinclude --postvalid --noent --noblanks --noout
LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout LINT_FLAGS = --debug --xinclude --noent --noblanks --nonet --noout
#SCHEMA_FLAGS = --relaxng /usr/share/xml/docbook5/schema/rng/5.0/docbookxi.rng #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 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 # XML, all one page
# Some info on canonicalization # Some info on canonicalization
# http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html # 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-single.xml
set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml
# HTML, all one page # HTML, all one page
manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html manual_html = ${docbook_outdir}/html/libstdc++-manual-single.html
...@@ -388,7 +446,10 @@ 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 manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf
DBLATEX_FLAGS = --dump --verbose --pdf -o ${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 = \ DB2TEXI_FLAGS = \
--encoding=utf-8//TRANSLIT \ --encoding=utf-8//TRANSLIT \
--string-param output-file="libstdc++-manual" \ --string-param output-file="libstdc++-manual" \
...@@ -396,13 +457,16 @@ DB2TEXI_FLAGS = \ ...@@ -396,13 +457,16 @@ DB2TEXI_FLAGS = \
--string-param explicit-node-names=true --string-param explicit-node-names=true
# EPUB, via dbtoepub + ruby
manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
# Performance doc and graph configuration. # Performance doc and graph configuration.
# Assumes pychart, beautiful soup installed. # Assumes pychart, beautiful soup installed.
# Generates the plots and graphs for performance testing. # Generates the plots and graphs for performance testing.
doc_performance_script = ${top_srcdir}/scripts/make_graphs.py doc_performance_script = ${top_srcdir}/scripts/make_graphs.py
# By adding these files here, automake will remove them for 'make clean' # By adding these files here, automake will remove them for 'make clean'
CLEANFILES = *.log CLEANFILES = *.log stamp*
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
...@@ -486,42 +550,24 @@ distclean: distclean-am ...@@ -486,42 +550,24 @@ distclean: distclean-am
-rm -f Makefile -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am: dvi-am:
html: html-am
html-am: html-am:
info: info-am
info-am: info-am:
install-data-am: install-data-am:
install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-exec-am:
install-html: install-html-am
install-html-am: install-html-am:
install-info: install-info-am
install-info-am: install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am: install-pdf-am:
install-ps: install-ps-am
install-ps-am: install-ps-am:
installcheck-am: installcheck-am:
...@@ -534,12 +580,8 @@ mostlyclean: mostlyclean-am ...@@ -534,12 +580,8 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
pdf-am: pdf-am:
ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-am:
...@@ -558,76 +600,157 @@ uninstall-am: ...@@ -558,76 +600,157 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
# Documentation Overview # Documentation primary rules.
#
# 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 # xml:
# performance tests, and should be considered experimental. # 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. xml: $(STAMP_XML)
# install-xml: $(STAMP_INSTALL_XML)
# Point to best sub-rule for the requested documentation target,
# create, and then copy into toplevel directory with standardized names
# and layouts.
# HTML html: $(STAMP_HTML)
doc-html: doc-html-docbook doc-html-doxygen install-html: $(STAMP_INSTALL_HTML)
cp -R ${docbook_outdir}/html ./libstdc++-manual.html
cp -R ${doxygen_outdir}/html ./libstdc++-api.html
# MAN man: $(STAMP_MAN)
doc-man: doc-man-doxygen install-man: $(STAMP_INSTALL_MAN)
cp -R ${doxygen_outdir}/man ./libstdc++-api.man
# PDF pdf: $(STAMP_PDF)
doc-pdf: doc-pdf-docbook doc-pdf-doxygen install-pdf: $(STAMP_INSTALL_PDF)
cp ${docbook_outdir}/pdf/libstdc++-manual.pdf .
cp ${doxygen_outdir}/pdf/libstdc++-api.pdf .
# TEXINFO epub: $(STAMP_EPUB)
doc-texinfo: doc-texinfo-docbook install-epub: $(STAMP_INSTALL_EPUB)
# XML info:
doc-xml: doc-xml-single-docbook doc-xml-single-doxygen install-info:
cp ${manual_xml} .
cp ${api_xml} .
doc-html-doxygen: ps:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ install-ps:
builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=html $${srcdir} $${builddir} YES)
doc-man-doxygen: dvi:
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ install-dvi:
builddir=`cd ..; ${PWD_COMMAND}`; \ stamp-xml: stamp-xml-single-docbook stamp-xml-single-doxygen
${SHELL} ${doxygen_script} \ $(STAMP) stamp-xml
--host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
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}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \ builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \ ${SHELL} ${doxygen_script} \
--host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO) --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..." @echo "Generating doxygen xml single file..."
$(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \ $(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \
${doxygen_outdir}/xml/index.xml > ${api_xml}; ${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}`; \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
builddir=`cd ..; ${PWD_COMMAND}`; \ builddir=`cd ..; ${PWD_COMMAND}`; \
${SHELL} ${doxygen_script} \ ${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: stamp-latex-doxygen: ${doxygen_outdir}/latex
mkdir -p ${doxygen_outdir}/pdf -(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;) -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
echo "Generating doxygen pdf file..."; echo "Generating doxygen pdf file...";
if [ -f ${doxygen_pdf} ]; then \ if [ -f ${doxygen_pdf} ]; then \
...@@ -637,25 +760,24 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf ...@@ -637,25 +760,24 @@ doc-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
echo "... error"; \ echo "... error"; \
exit 12; \ exit 12; \
fi fi
stamp-pdf-doxygen:
@if [ ! -f stamp-pdf-doxygen ]; then \
$(MAKE) doc-pdf-doxygen; \
fi
$(STAMP) stamp-pdf-doxygen $(STAMP) stamp-pdf-doxygen
stamp-xml-doxygen: stamp-man-doxygen: ${doxygen_outdir}/man
@if [ ! -f stamp-xml-doxygen ]; then \ -(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
$(MAKE) doc-xml-doxygen; \ builddir=`cd ..; ${PWD_COMMAND}`; \
$(MAKE) doc-xml-single-doxygen; \ ${SHELL} ${doxygen_script} \
fi --host_alias=${host_alias} --mode=man $${srcdir} $${builddir} YES)
$(STAMP) stamp-xml-doxygen $(STAMP) stamp-man-doxygen
stamp-latex-doxygen: doc-xml-doxygen: stamp-xml-doxygen
@if [ ! -f stamp-latex-doxygen ]; then \ doc-xml-single-doxygen: stamp-xml-single-doxygen
$(MAKE) doc-latex-doxygen; \ doc-html-doxygen: stamp-html-doxygen
fi doc-latex-doxygen: stamp-latex-doxygen
$(STAMP) 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: ${docbook_outdir}/fo:
mkdir -p ${docbook_outdir}/fo mkdir -p ${docbook_outdir}/fo
...@@ -673,35 +795,71 @@ ${docbook_outdir}/xml: ...@@ -673,35 +795,71 @@ ${docbook_outdir}/xml:
mkdir -p ${docbook_outdir}/xml mkdir -p ${docbook_outdir}/xml
doc-xml-validate-docbook: $(xml_sources) doc-xml-validate-docbook: $(xml_sources)
@echo "Generating XML validation log..." @echo "Generating XML validation log..."
$(XMLLINT) $(XMLLINT_FLAGS) ${top_srcdir}/doc/xml/spine.xml $(XMLLINT) $(XMLLINT_VALID_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..." @echo "Generating XML single..."
$(XMLLINT) --xinclude --noent --noblanks --nocdata --nsclean --c14n \ $(XMLLINT) $(XMLLINT_FLAGS) \
${top_srcdir}/doc/xml/manual/spine.xml > ${manual_xml} ${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 # HTML, index plus chapters
doc-html-docbook: $(xml_sources) ${docbook_outdir}/html stamp-html-docbook: $(xml_sources) ${docbook_outdir}/html
@echo "Generating html files..." @echo "Generating html files..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/html/ \
$(XSL_HTML_STYLE) ${top_srcdir}/doc/xml/spine.xml $(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..." @echo "Generating html single file..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${manual_html} \
$(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml $(XSL_HTML_SINGLE_STYLE) ${top_srcdir}/doc/xml/spine.xml
$(STAMP) stamp-html-single-docbook
doc-html-single-docbook: stamp-html-single-docbook
# FO # FO
doc-fo-docbook: $(xml_sources) ${docbook_outdir}/fo stamp-fo-docbook: $(xml_sources) ${docbook_outdir}/fo
@echo "Generating FO files..." @echo "Generating FO files..."
$(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ${docbook_outdir}/fo/spine.fo \
$(XSL_FO_STYLE) ${top_srcdir}/doc/xml/spine.xml $(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..." @echo "Generating pdf dblatex files..."
dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml 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..." @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: doc-html-performance:
-@(chmod + ${doc_performance_script}; \ -@(chmod + ${doc_performance_script}; \
${doc_performance_script} ${top_srcdir} \ ${doc_performance_script} ${top_srcdir} \
...@@ -713,7 +871,7 @@ doc-html-performance: ...@@ -713,7 +871,7 @@ doc-html-performance:
# To remove directories. # To remove directories.
clean-local: 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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
......
...@@ -1304,7 +1304,7 @@ LATEX_HEADER = ...@@ -1304,7 +1304,7 @@ LATEX_HEADER =
# contain links (just like the HTML output) instead of page references # contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer. # 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 # 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 # plain latex in the generated Makefile. Set this option to YES to get a
......
...@@ -7,8 +7,10 @@ digraph v3conf { ...@@ -7,8 +7,10 @@ digraph v3conf {
"configure" -> "configure.ac"; "configure" -> "configure.ac";
"configure" -> "crossconfig.m4"; "configure" -> "crossconfig.m4";
"configure" -> "linkage.m4"; "configure" -> "linkage.m4";
"[*/]Makefile" -> "[*/]Makefile.in";
"[*/]Makefile.in" -> "Makefile.am"; "[*/]Makefile.in" -> "Makefile.am";
"[*/]Makefile.in" -> "configure.ac"; "[*/]Makefile.in" -> "configure.ac";
"config.h" -> "config.h.in"
"config.h.in" -> "acconfig.h"; "config.h.in" -> "acconfig.h";
"config.h.in" -> "configure.ac"; "config.h.in" -> "configure.ac";
} }
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<screen> <screen>
<inlinemediaobject> <inlinemediaobject>
<imageobject> <imageobject>
<imagedata fileref="../images/confdeps.png"/> <imagedata fileref="images/confdeps.png"/>
</imageobject> </imageobject>
<textobject> <textobject>
<phrase>Dependency Graph Configure to Build Files</phrase> <phrase>Dependency Graph Configure to Build Files</phrase>
......
...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = include subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ ...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ ...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -40,7 +40,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -40,7 +40,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am $(glibcxxinstall_HEADERS)
subdir = libsupc++ subdir = libsupc++
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -164,8 +165,12 @@ CXXFILT = @CXXFILT@ ...@@ -164,8 +165,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -215,7 +220,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -215,7 +220,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -228,6 +235,8 @@ USE_NLS = @USE_NLS@ ...@@ -228,6 +235,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = po subdir = po
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ ...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ ...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = python subdir = python
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -129,8 +130,12 @@ CXXFILT = @CXXFILT@ ...@@ -129,8 +130,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -180,7 +185,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -180,7 +185,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -193,6 +200,8 @@ USE_NLS = @USE_NLS@ ...@@ -193,6 +200,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# We can check now that the version of doxygen is >= this variable. # We can check now that the version of doxygen is >= this variable.
DOXYVER=1.7.2 DOXYVER=1.7.1
find_doxygen() { find_doxygen() {
local -r v_required=`echo $DOXYVER | \ local -r v_required=`echo $DOXYVER | \
......
...@@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -39,7 +39,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = src subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -163,8 +164,12 @@ CXXFILT = @CXXFILT@ ...@@ -163,8 +164,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -214,7 +219,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -214,7 +219,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -227,6 +234,8 @@ USE_NLS = @USE_NLS@ ...@@ -227,6 +234,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ ...@@ -38,7 +38,8 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.am
subdir = testsuite subdir = testsuite
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/futex.m4 \
$(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lead-dot.m4 \
...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@ ...@@ -105,8 +106,12 @@ CXXFILT = @CXXFILT@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@
DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ ...@@ -156,7 +161,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RUBY = @RUBY@
SECTION_FLAGS = @SECTION_FLAGS@ SECTION_FLAGS = @SECTION_FLAGS@
SECTION_LDFLAGS = @SECTION_LDFLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
SED = @SED@ SED = @SED@
...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@ ...@@ -169,6 +176,8 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
abs_builddir = @abs_builddir@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@ abs_top_builddir = @abs_top_builddir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment