OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.am (stamp-epub-docbook): Fix image directory location. 

2011-09-21  Benjamin Kosnik  <bkoz@redhat.com

	* doc/Makefile.am (stamp-epub-docbook): Fix image directory location.
	* doc/Makefile.in: Regenerate.

From-SVN: r179066
This commit is contained in:
Benjamin Kosnik 2011-09-21 23:46:36 +00:00 committed by Benjamin Kosnik
parent 5f9f351709
commit 696d4bc16e
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-21 Benjamin Kosnik <bkoz@redhat.com
* doc/Makefile.am (stamp-epub-docbook): Fix image directory location.
* doc/Makefile.in: Regenerate.
2011-09-21 Paolo Carlini <paolo.carlini@oracle.com>
* src/limits.cc: Replace everywhere __int128_t -> __int128, and

12
libstdc++-v3/doc/Makefile.am
View File

@ -396,7 +396,7 @@ xml_image_basic = \
${xml_image_dir}/pbds_tree_node_invariants.png \
${xml_image_dir}/pbds_tree_node_updator_policy_cd.png \
${xml_image_dir}/pbds_trie_node_updator_policy_cd.png \
${xml_image_dir}/pbds_update_seq_diagram.png
${xml_image_dir}/pbds_update_seq_diagram.png
xml_image_generated = \
${xml_image_dir}/pbds_binary_priority_queue_int_push_pop.png \
@ -488,7 +488,6 @@ ${docbook_outdir}/texinfo:
${docbook_outdir}/xml:
mkdir -p ${docbook_outdir}/xml
mkdir -p ${docbook_outdir}/xml/images
# Validate existing XML structure.
XMLLINT = xmllint
@ -512,9 +511,6 @@ stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/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
@ -595,10 +591,14 @@ doc-texinfo-docbook: stamp-texinfo-docbook
doc-info-docbook: stamp-info-docbook
# EPUB, via dbtoepub + ruby
# EPUB, via ruby + dbtoepub
# 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}
$(STAMP) stamp-epub-docbook

12
libstdc++-v3/doc/Makefile.in
View File

@ -449,7 +449,7 @@ xml_image_basic = \
${xml_image_dir}/pbds_tree_node_invariants.png \
${xml_image_dir}/pbds_tree_node_updator_policy_cd.png \
${xml_image_dir}/pbds_trie_node_updator_policy_cd.png \
${xml_image_dir}/pbds_update_seq_diagram.png
${xml_image_dir}/pbds_update_seq_diagram.png
xml_image_generated = \
${xml_image_dir}/pbds_binary_priority_queue_int_push_pop.png \
@ -549,7 +549,8 @@ DB2TEXI_FLAGS = \
--string-param explicit-node-names=true
# EPUB, via dbtoepub + ruby
# EPUB, via ruby + dbtoepub
# Can verify document with: epubcheck
manual_epub = ${docbook_outdir}/epub/libstdc++-manual.epub
# Performance doc and graph configuration.
@ -887,7 +888,6 @@ ${docbook_outdir}/texinfo:
${docbook_outdir}/xml:
mkdir -p ${docbook_outdir}/xml
mkdir -p ${docbook_outdir}/xml/images
doc-xml-validate-docbook: $(xml_sources) $(xml_images)
@echo "Generating XML validation log..."
$(XMLLINT) $(XMLLINT_VALID_FLAGS) ${top_srcdir}/doc/xml/spine.xml
@ -897,9 +897,6 @@ stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/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
@ -964,6 +961,9 @@ doc-texinfo-docbook: stamp-texinfo-docbook
doc-info-docbook: stamp-info-docbook
stamp-epub-docbook: stamp-xml-single-docbook ${docbook_outdir}/epub
@echo "Generating epub files..."
if [ ! -d "${docbook_outdir}/images" ]; then \
$(LN_S) ${top_srcdir}/doc/xml/images ${docbook_outdir}/; \
fi
${XSL_STYLE_DIR}/epub/bin/dbtoepub -v -d -o ${manual_epub} ${set_xml}
$(STAMP) stamp-epub-docbook