From cd1be69fee37bfb5dcf849583986cd12b1ea9107 Mon Sep 17 00:00:00 2001 From: bkoz Date: Tue, 17 Jan 2012 23:39:21 +0000 Subject: [PATCH] 2012-01-17 Benjamin Kosnik * configure.ac (BUILD_EPUB): Adjust for epub3. * configure: Regenerate. * Makefile.in: Same. * doc/Makefile.am (stamp-epub-docbook): Update for epub3. * doc/Makefile.in: Regenerate. * include/Makefile.in: Same. * libsupc++/Makefile.in: Same. * po/Makefile.in: Same. * python/Makefile.in: Same. * src/Makefile.in: Same. * testsuite/Makefile.in: Same. * doc/xml/manual/documentation_hacking.xml: Update. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183263 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 16 +++ libstdc++-v3/Makefile.in | 2 - libstdc++-v3/configure | 115 +++++++-------------- libstdc++-v3/configure.ac | 13 ++- libstdc++-v3/doc/Makefile.am | 16 ++- libstdc++-v3/doc/Makefile.in | 17 +-- .../doc/xml/manual/documentation_hacking.xml | 10 ++ libstdc++-v3/include/Makefile.in | 2 - libstdc++-v3/libsupc++/Makefile.in | 2 - libstdc++-v3/po/Makefile.in | 2 - libstdc++-v3/python/Makefile.in | 2 - libstdc++-v3/src/Makefile.in | 2 - libstdc++-v3/testsuite/Makefile.in | 2 - 13 files changed, 96 insertions(+), 105 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3b16284da60..ddfed728edf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2012-01-17 Benjamin Kosnik + + * configure.ac (BUILD_EPUB): Adjust for epub3. + * configure: Regenerate. + * Makefile.in: Same. + * doc/Makefile.am (stamp-epub-docbook): Update for epub3. + * doc/Makefile.in: Regenerate. + * include/Makefile.in: Same. + * libsupc++/Makefile.in: Same. + * po/Makefile.in: Same. + * python/Makefile.in: Same. + * src/Makefile.in: Same. + * testsuite/Makefile.in: Same. + + * doc/xml/manual/documentation_hacking.xml: Update. + 2012-01-17 Rainer Orth PR target/47852 diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 368f896a24e..ba19d09fdb1 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -133,7 +133,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -189,7 +188,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 3c64a28e3c8..5b7cacfef7e 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -620,8 +620,6 @@ ATOMIC_WORD_SRCDIR ATOMICITY_SRCDIR BUILD_EPUB_FALSE BUILD_EPUB_TRUE -DBTOEPUB -RUBY BUILD_PDF_FALSE BUILD_PDF_TRUE PDFLATEX @@ -11488,7 +11486,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11491 "configure" +#line 11489 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11594,7 +11592,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11597 "configure" +#line 11595 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14952,7 +14950,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14955 "configure" +#line 14953 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15283,7 +15281,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15286 "configure" +#line 15284 "configure" int main() { typedef bool atomic_type; @@ -15317,7 +15315,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15320 "configure" +#line 15318 "configure" int main() { typedef short atomic_type; @@ -15351,7 +15349,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15354 "configure" +#line 15352 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15386,7 +15384,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15389 "configure" +#line 15387 "configure" int main() { typedef long long atomic_type; @@ -15462,7 +15460,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 15465 "configure" +#line 15463 "configure" int main() { _Decimal32 d1; @@ -15504,7 +15502,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15507 "configure" +#line 15505 "configure" template struct same { typedef T2 type; }; @@ -15538,7 +15536,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15541 "configure" +#line 15539 "configure" template struct same { typedef T2 type; }; @@ -65827,7 +65825,7 @@ else fi -# Check for pdf/epub dependencies. +# Check for pdf 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 @@ -65914,84 +65912,51 @@ else 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 : +# Check for epub dependencies. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl" >&5 +$as_echo_n "checking for /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl... " >&6; } +if test "${ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl+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. + test "$cross_compiling" = yes && + as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl"; then + ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl=yes 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" + ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl=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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" >&5 +$as_echo "$ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" >&6; } +if test "x$ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" = x""yes; then : + ac_cv_file_epub3_a=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_file_epub3_a=no fi - -# Extract the first word of "dbtoepub", so it can be a program name with args. -set dummy dbtoepub; 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 "$as_me:${as_lineno-$LINENO}: checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl" >&5 +$as_echo_n "checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl... " >&6; } +if test "${ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl+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. + 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/epub3/chunk.xsl"; then + ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl=yes 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" + ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl=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; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" >&5 +$as_echo "$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" >&6; } +if test "x$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" = x""yes; then : + ac_cv_file_epub3_b=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_file_epub3_b=no fi - - if test $ac_cv_prog_RUBY = "yes" && - test $ac_cv_prog_DBTOEPUB = "yes"; then + if test $ac_cv_file_epub3_a = "yes" || + test $ac_cv_file_epub3_b = "yes"; then BUILD_EPUB_TRUE= BUILD_EPUB_FALSE='#' else diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index d453f63e207..1c62aeadb46 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -373,18 +373,21 @@ AM_CONDITIONAL(BUILD_MAN, test $ac_cv_prog_DOXYGEN = "yes" && test $ac_cv_prog_DOT = "yes") -# Check for pdf/epub dependencies. +# Check for pdf 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], dbtoepub, yes, no) +# Check for epub dependencies. +AC_CHECK_FILE(/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl, + ac_cv_file_epub3_a=yes, ac_cv_file_epub3_a=no) +AC_CHECK_FILE(/usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl, + ac_cv_file_epub3_b=yes, ac_cv_file_epub3_b=no) AM_CONDITIONAL(BUILD_EPUB, - test $ac_cv_prog_RUBY = "yes" && - test $ac_cv_prog_DBTOEPUB = "yes") + test $ac_cv_file_epub3_a = "yes" || + test $ac_cv_file_epub3_b = "yes") # Propagate the target-specific source directories through the build chain. diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 3cb6dce23b3..0f7b2852bcb 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -467,10 +467,11 @@ XSLT_PARAM = --param toc.section.depth 4 XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl -XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl +XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl ${docbook_outdir}/epub: mkdir -p ${docbook_outdir}/epub + mkdir -p ${docbook_outdir}/epub/OEBPS/images ${docbook_outdir}/fo: mkdir -p ${docbook_outdir}/fo @@ -592,20 +593,25 @@ doc-texinfo-docbook: stamp-texinfo-docbook doc-info-docbook: stamp-info-docbook -# EPUB, via ruby + dbtoepub -# Can verify document with: epubcheck +# EPUB version 3 +# http://sourceforge.net/projects/docbook/files/epub3/ +# Can verify document with epubcheck manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub @echo "Generating epub files..." if [ ! -d "${docbook_outdir}/images" ]; then \ $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \ fi - ${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml} + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) \ + --stringparam base.dir "${docbook_outdir}/epub/OEBPS/" \ + $(XSL_EPUB_STYLE) ${top_srcdir}/doc/xml/spine.xml + $(INSTALL_DATA) $(xml_images) ${docbook_outdir}/epub/OEBPS/images + zip -X0 ${manual_epub} ${docbook_outdir}/epub/mimetype + zip -r -X9 ${manual_epub} ${docbook_outdir}/epub/META-INF ${docbook_outdir}/epub/OEBPS $(STAMP) stamp-epub-docbook doc-epub-docbook: stamp-epub-docbook - # Performance doc and graph configuration. # Assumes pychart, beautiful soup installed. # Generates the plots/graph imagery for performance testing. diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index c79af0f4cd2..7a5498e84e8 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ @@ -518,7 +516,7 @@ XSLT_PARAM = --param toc.section.depth 4 XSL_FO_STYLE = $(XSL_STYLE_DIR)/fo/docbook.xsl XSL_HTML_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/chunk.xsl XSL_HTML_SINGLE_STYLE = $(XSL_STYLE_DIR)/xhtml-1_1/docbook.xsl -XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub/docbook.xsl +XSL_EPUB_STYLE = $(XSL_STYLE_DIR)/epub3/chunk.xsl LINT_FLAGS = --debug --xinclude --noent --noblanks --noout SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd @@ -549,8 +547,9 @@ DB2TEXI_FLAGS = \ --string-param explicit-node-names=true -# EPUB, via ruby + dbtoepub -# Can verify document with: epubcheck +# EPUB version 3 +# http://sourceforge.net/projects/docbook/files/epub3/ +# Can verify document with epubcheck manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub # Performance doc and graph configuration. @@ -871,6 +870,7 @@ doc-man-doxygen: stamp-man-doxygen ${docbook_outdir}/epub: mkdir -p ${docbook_outdir}/epub + mkdir -p ${docbook_outdir}/epub/OEBPS/images ${docbook_outdir}/fo: mkdir -p ${docbook_outdir}/fo @@ -965,7 +965,12 @@ stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub if [ ! -d "${docbook_outdir}/images" ]; then \ $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \ fi - ${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml} + $(XSLTPROC) $(XSLT_PARAM) $(XSLT_FLAGS) \ + --stringparam base.dir "${docbook_outdir}/epub/OEBPS/" \ + $(XSL_EPUB_STYLE) ${top_srcdir}/doc/xml/spine.xml + $(INSTALL_DATA) $(xml_images) ${docbook_outdir}/epub/OEBPS/images + zip -X0 ${manual_epub} ${docbook_outdir}/epub/mimetype + zip -r -X9 ${manual_epub} ${docbook_outdir}/epub/META-INF ${docbook_outdir}/epub/OEBPS $(STAMP) stamp-epub-docbook doc-epub-docbook: stamp-epub-docbook diff --git a/libstdc++-v3/doc/xml/manual/documentation_hacking.xml b/libstdc++-v3/doc/xml/manual/documentation_hacking.xml index f6d7d55e04a..2fe7692148a 100644 --- a/libstdc++-v3/doc/xml/manual/documentation_hacking.xml +++ b/libstdc++-v3/doc/xml/manual/documentation_hacking.xml @@ -611,6 +611,12 @@ info output + + epub3 stylesheets + b3 + epub output + + @@ -675,6 +681,10 @@ For Texinfo output, something that transforms valid Docbook XML to Texinfo is required. The default choice is docbook2X. + + + For epub output, the stylesheets for EPUB3 are required. These stylesheets are still in development. To validate the created file, epubcheck is necessary. +
Generating the DocBook Files diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index f701c66c35e..a50b6282756 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 6d9364efd12..e5af706be41 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -167,7 +167,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -223,7 +222,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index fa72b85b0a2..e428385a757 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 4f2bf5c5cf8..2948f873dcb 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -131,7 +131,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -187,7 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 5c0747e93f9..ef4d0a2f1e3 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -171,7 +171,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -227,7 +226,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 236b4610d40..b56c639bbcc 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DBLATEX = @DBLATEX@ -DBTOEPUB = @DBTOEPUB@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ DOT = @DOT@ @@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ -RUBY = @RUBY@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ SED = @SED@ -- 2.11.0