Skip to content

R
riscv-gcc-1
Commit 43fe49ec by Benjamin Kosnik Committed by Benjamin Kosnik
Options

configure.ac (BUILD_EPUB): Adjust for epub3. 

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

	* 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.

From-SVN: r183263
parent 3bdb97b8
Showing with 96 additions and 105 deletions
libstdc++-v3/ChangeLog
2012-01-17 Benjamin Kosnik <bkoz@redhat.com>
* 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 <ro@CeBiTec.Uni-Bielefeld.DE> 2012-01-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR target/47852 PR target/47852
......
libstdc++-v3/Makefile.in
...@@ -133,7 +133,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -133,7 +133,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -189,7 +188,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -189,7 +188,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/configure
...@@ -620,8 +620,6 @@ ATOMIC_WORD_SRCDIR ...@@ -620,8 +620,6 @@ ATOMIC_WORD_SRCDIR
ATOMICITY_SRCDIR ATOMICITY_SRCDIR
BUILD_EPUB_FALSE BUILD_EPUB_FALSE
BUILD_EPUB_TRUE BUILD_EPUB_TRUE
DBTOEPUB
RUBY
BUILD_PDF_FALSE BUILD_PDF_FALSE
BUILD_PDF_TRUE BUILD_PDF_TRUE
PDFLATEX PDFLATEX
...@@ -11488,7 +11486,7 @@ else ...@@ -11488,7 +11486,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 11491 "configure" #line 11489 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -11594,7 +11592,7 @@ else ...@@ -11594,7 +11592,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 11597 "configure" #line 11595 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -14952,7 +14950,7 @@ fi ...@@ -14952,7 +14950,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 14955 "configure" #line 14953 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
...@@ -15283,7 +15281,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } ...@@ -15283,7 +15281,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 15286 "configure" #line 15284 "configure"
int main() int main()
{ {
typedef bool atomic_type; typedef bool atomic_type;
...@@ -15317,7 +15315,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } ...@@ -15317,7 +15315,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 15320 "configure" #line 15318 "configure"
int main() int main()
{ {
typedef short atomic_type; typedef short atomic_type;
...@@ -15351,7 +15349,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } ...@@ -15351,7 +15349,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 15354 "configure" #line 15352 "configure"
int main() int main()
{ {
// NB: _Atomic_word not necessarily int. // NB: _Atomic_word not necessarily int.
...@@ -15386,7 +15384,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } ...@@ -15386,7 +15384,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 15389 "configure" #line 15387 "configure"
int main() int main()
{ {
typedef long long atomic_type; typedef long long atomic_type;
...@@ -15462,7 +15460,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu ...@@ -15462,7 +15460,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 15465 "configure" #line 15463 "configure"
int main() int main()
{ {
_Decimal32 d1; _Decimal32 d1;
...@@ -15504,7 +15502,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ...@@ -15504,7 +15502,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# unnecessary for this test. # unnecessary for this test.
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15507 "configure" #line 15505 "configure"
template<typename T1, typename T2> template<typename T1, typename T2>
struct same struct same
{ typedef T2 type; }; { typedef T2 type; };
...@@ -15538,7 +15536,7 @@ $as_echo "$enable_int128" >&6; } ...@@ -15538,7 +15536,7 @@ $as_echo "$enable_int128" >&6; }
rm -f conftest* rm -f conftest*
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 15541 "configure" #line 15539 "configure"
template<typename T1, typename T2> template<typename T1, typename T2>
struct same struct same
{ typedef T2 type; }; { typedef T2 type; };
...@@ -65827,7 +65825,7 @@ else ...@@ -65827,7 +65825,7 @@ else
fi 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. # Extract the first word of "dblatex", so it can be a program name with args.
set dummy dblatex; ac_word=$2 set dummy dblatex; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
...@@ -65914,84 +65912,51 @@ else ...@@ -65914,84 +65912,51 @@ else
fi fi
# Extract the first word of "ruby", so it can be a program name with args. # Check for epub dependencies.
set dummy ruby; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub3/chunk.xsl... " >&6; }
$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl+set}" = set; then :
if test "${ac_cv_prog_RUBY+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
if test -n "$RUBY"; then test "$cross_compiling" = yes &&
ac_cv_prog_RUBY="$RUBY" # Let the user override the test. 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 else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl=no
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
fi fi
RUBY=$ac_cv_prog_RUBY { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" >&5
if test -n "$RUBY"; then $as_echo "$ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5 if test "x$ac_cv_file__usr_share_xml_docbook_stylesheet_docbook_xsl_ns_epub3_chunk_xsl" = x""yes; then :
$as_echo "$RUBY" >&6; } ac_cv_file_epub3_a=yes
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ac_cv_file_epub3_a=no
$as_echo "no" >&6; }
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl" >&5
# Extract the first word of "dbtoepub", so it can be a program name with args. $as_echo_n "checking for /usr/share/sgml/docbook/xsl-ns-stylesheets/epub3/chunk.xsl... " >&6; }
set dummy dbtoepub; ac_word=$2 if test "${ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl+set}" = set; then :
{ $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 $as_echo_n "(cached) " >&6
else else
if test -n "$DBTOEPUB"; then test "$cross_compiling" = yes &&
ac_cv_prog_DBTOEPUB="$DBTOEPUB" # Let the user override the test. 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 else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl=no
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
fi fi
DBTOEPUB=$ac_cv_prog_DBTOEPUB { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" >&5
if test -n "$DBTOEPUB"; then $as_echo "$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 if test "x$ac_cv_file__usr_share_sgml_docbook_xsl_ns_stylesheets_epub3_chunk_xsl" = x""yes; then :
$as_echo "$DBTOEPUB" >&6; } ac_cv_file_epub3_b=yes
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ac_cv_file_epub3_b=no
$as_echo "no" >&6; }
fi fi
if test $ac_cv_file_epub3_a = "yes" ||
if test $ac_cv_prog_RUBY = "yes" && test $ac_cv_file_epub3_b = "yes"; then
test $ac_cv_prog_DBTOEPUB = "yes"; then
BUILD_EPUB_TRUE= BUILD_EPUB_TRUE=
BUILD_EPUB_FALSE='#' BUILD_EPUB_FALSE='#'
else else
libstdc++-v3/configure.ac
...@@ -373,18 +373,21 @@ AM_CONDITIONAL(BUILD_MAN, ...@@ -373,18 +373,21 @@ AM_CONDITIONAL(BUILD_MAN,
test $ac_cv_prog_DOXYGEN = "yes" && test $ac_cv_prog_DOXYGEN = "yes" &&
test $ac_cv_prog_DOT = "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([DBLATEX], dblatex, yes, no)
AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no) AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no)
AM_CONDITIONAL(BUILD_PDF, AM_CONDITIONAL(BUILD_PDF,
test $ac_cv_prog_DBLATEX = "yes" && test $ac_cv_prog_DBLATEX = "yes" &&
test $ac_cv_prog_PDFLATEX = "yes") test $ac_cv_prog_PDFLATEX = "yes")
AC_CHECK_PROG([RUBY], ruby, yes, no) # Check for epub dependencies.
AC_CHECK_PROG([DBTOEPUB], dbtoepub, yes, no) 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, AM_CONDITIONAL(BUILD_EPUB,
test $ac_cv_prog_RUBY = "yes" && test $ac_cv_file_epub3_a = "yes" ||
test $ac_cv_prog_DBTOEPUB = "yes") test $ac_cv_file_epub3_b = "yes")
# Propagate the target-specific source directories through the build chain. # Propagate the target-specific source directories through the build chain.
......
libstdc++-v3/doc/Makefile.am
...@@ -467,10 +467,11 @@ XSLT_PARAM = --param toc.section.depth 4 ...@@ -467,10 +467,11 @@ XSLT_PARAM = --param toc.section.depth 4
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-1_1/chunk.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_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: ${docbook_outdir}/epub:
mkdir -p ${docbook_outdir}/epub mkdir -p ${docbook_outdir}/epub
mkdir -p ${docbook_outdir}/epub/OEBPS/images
${docbook_outdir}/fo: ${docbook_outdir}/fo:
mkdir -p ${docbook_outdir}/fo mkdir -p ${docbook_outdir}/fo
...@@ -592,20 +593,25 @@ doc-texinfo-docbook: stamp-texinfo-docbook ...@@ -592,20 +593,25 @@ doc-texinfo-docbook: stamp-texinfo-docbook
doc-info-docbook: stamp-info-docbook doc-info-docbook: stamp-info-docbook
# EPUB, via ruby + dbtoepub # EPUB version 3
# Can verify document with: epubcheck # http://sourceforge.net/projects/docbook/files/epub3/
# Can verify document with epubcheck
manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
@echo "Generating epub files..." @echo "Generating epub files..."
if [ ! -d "${docbook_outdir}/images" ]; then \ if [ ! -d "${docbook_outdir}/images" ]; then \
$(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \ $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
fi 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 $(STAMP) stamp-epub-docbook
doc-epub-docbook: stamp-epub-docbook doc-epub-docbook: stamp-epub-docbook
# Performance doc and graph configuration. # Performance doc and graph configuration.
# Assumes pychart, beautiful soup installed. # Assumes pychart, beautiful soup installed.
# Generates the plots/graph imagery for performance testing. # Generates the plots/graph imagery for performance testing.
......
libstdc++-v3/doc/Makefile.in
...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
...@@ -518,7 +516,7 @@ XSLT_PARAM = --param toc.section.depth 4 ...@@ -518,7 +516,7 @@ XSLT_PARAM = --param toc.section.depth 4
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-1_1/chunk.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_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 LINT_FLAGS = --debug --xinclude --noent --noblanks --noout
SCHEMA_FLAGS = http://www.docbook.org/xml/5.0/dtd/docbook.dtd 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 #SCHEMA_FLAGS = --nonet /usr/share/xml/docbook5/schema/dtd/5.0/docbook.dtd
...@@ -549,8 +547,9 @@ DB2TEXI_FLAGS = \ ...@@ -549,8 +547,9 @@ DB2TEXI_FLAGS = \
--string-param explicit-node-names=true --string-param explicit-node-names=true
# EPUB, via ruby + dbtoepub # EPUB version 3
# Can verify document with: epubcheck # http://sourceforge.net/projects/docbook/files/epub3/
# Can verify document with epubcheck
manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
# Performance doc and graph configuration. # Performance doc and graph configuration.
...@@ -871,6 +870,7 @@ doc-man-doxygen: stamp-man-doxygen ...@@ -871,6 +870,7 @@ doc-man-doxygen: stamp-man-doxygen
${docbook_outdir}/epub: ${docbook_outdir}/epub:
mkdir -p ${docbook_outdir}/epub mkdir -p ${docbook_outdir}/epub
mkdir -p ${docbook_outdir}/epub/OEBPS/images
${docbook_outdir}/fo: ${docbook_outdir}/fo:
mkdir -p ${docbook_outdir}/fo mkdir -p ${docbook_outdir}/fo
...@@ -965,7 +965,12 @@ stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub ...@@ -965,7 +965,12 @@ stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
if [ ! -d "${docbook_outdir}/images" ]; then \ if [ ! -d "${docbook_outdir}/images" ]; then \
$(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \ $(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
fi 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 $(STAMP) stamp-epub-docbook
doc-epub-docbook: stamp-epub-docbook doc-epub-docbook: stamp-epub-docbook
......
libstdc++-v3/doc/xml/manual/documentation_hacking.xml
...@@ -611,6 +611,12 @@ ...@@ -611,6 +611,12 @@
<entry>info output</entry> <entry>info output</entry>
</row> </row>
<row>
<entry>epub3 stylesheets</entry>
<entry>b3</entry>
<entry>epub output</entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</table> </table>
...@@ -675,6 +681,10 @@ ...@@ -675,6 +681,10 @@
For Texinfo output, something that transforms valid Docbook For Texinfo output, something that transforms valid Docbook
XML to Texinfo is required. The default choice is <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://docbook2x.sourceforge.net/">docbook2X</link>. XML to Texinfo is required. The default choice is <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://docbook2x.sourceforge.net/">docbook2X</link>.
</para> </para>
<para>
For epub output, the <link xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:href="http://sourceforge.net/projects/docbook/files/epub3/">stylesheets</link> for EPUB3 are required. These stylesheets are still in development. To validate the created file, <link xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:href="https://code.google.com/p/epubcheck/">epubcheck</link> is necessary.
</para>
</section> </section>
<section xml:id="docbook.rules"><info><title>Generating the DocBook Files</title></info> <section xml:id="docbook.rules"><info><title>Generating the DocBook Files</title></info>
......
libstdc++-v3/include/Makefile.in
...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/libsupc++/Makefile.in
...@@ -167,7 +167,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -167,7 +167,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -223,7 +222,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -223,7 +222,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/po/Makefile.in
...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/python/Makefile.in
...@@ -131,7 +131,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -131,7 +131,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -187,7 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -187,7 +186,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/src/Makefile.in
...@@ -171,7 +171,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -171,7 +171,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -227,7 +226,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -227,7 +226,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
libstdc++-v3/testsuite/Makefile.in
...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -107,7 +107,6 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
C_INCLUDE_DIR = @C_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@
DBLATEX = @DBLATEX@ DBLATEX = @DBLATEX@
DBTOEPUB = @DBTOEPUB@
DEBUG_FLAGS = @DEBUG_FLAGS@ DEBUG_FLAGS = @DEBUG_FLAGS@
DEFS = @DEFS@ DEFS = @DEFS@
DOT = @DOT@ DOT = @DOT@
...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ ...@@ -163,7 +162,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PDFLATEX = @PDFLATEX@ 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@
......
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