X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Fdoc%2FMakefile.am;h=4f79f9b187fdb9175f34a8c95d04ff2e66c0b474;hp=52ac78da8c04eb7775aa729f5a98cfcf74f62683;hb=752a6a48e7c621ed3e73bba8f921df76f5f9cf2a;hpb=0d155c07f0417978ae02c12b9af44c96b889227e;ds=sidebyside

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 52ac78da8c0..4f79f9b187f 100644
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -34,7 +34,7 @@ include $(top_srcdir)/fragment.am
 doc-man: doc-man-doxygen
 
 # PDF
-doc-pdf: doc-pdf-dblatex-docbook
+doc-pdf: doc-pdf-docbook
 
 # HTML
 doc-html: doc-html-docbook
@@ -44,6 +44,8 @@ doc-html: doc-html-docbook
 # Assumes doxygen, graphviz (with dot), pdflatex installed
 doxygen_script=${top_srcdir}/scripts/run_doxygen
 doxygen_outdir = ${glibcxx_builddir}/doc/doxygen
+doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
+
 doc-html-doxygen:
 	-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
 	  builddir=`cd ..; ${PWD_COMMAND}`; \
@@ -62,7 +64,7 @@ doc-xml-doxygen:
 	  ${SHELL} ${doxygen_script} \
 	  --host_alias=${host_alias} --mode=xml $${srcdir} $${builddir} NO)
 
-doc-xml-single-doxygen: doc-xml-doxygen
+doc-xml-single-doxygen:
 	@echo "Generating doxygen xml single file..."
 	$(XSLTPROC) ${doxygen_outdir}/xml/combine.xslt \
 	${doxygen_outdir}/xml/index.xml > ${doxygen_outdir}/xml/api-spine.xml;
@@ -73,9 +75,7 @@ doc-latex-doxygen:
 	  ${SHELL} ${doxygen_script} \
 	  --host_alias=${host_alias} --mode=latex $${srcdir} $${builddir} NO)
 
-# Chance of loooooonnggg wait time when creating this file.
-doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf
-
+# Chance of loooooonnggg creation time on this rule.
 doc-pdf-doxygen: stamp-latex-doxygen
 	-(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
 	echo "Generating doxygen pdf file...";
@@ -86,8 +86,15 @@ doc-pdf-doxygen: stamp-latex-doxygen
 	  exit 12; \
 	fi
 
+stamp-pdf-doxygen:
+	@if [ ! -f stamp-pdf-doxygen ]; then \
+	  $(MAKE) doc-pdf-doxygen; \
+	fi
+	$(STAMP) stamp-pdf-doxygen
+
 stamp-xml-doxygen:
 	@if [ ! -f stamp-xml-doxygen ]; then \
+	  $(MAKE) doc-xml-doxygen; \
 	  $(MAKE) doc-xml-single-doxygen; \
 	fi
 	$(STAMP) stamp-xml-doxygen
@@ -165,7 +172,8 @@ xml_sources_manual = \
 
 xml_sources_extra = \
 	${xml_dir}/gnu/fdl-1.2.xml \
-	${xml_dir}/gnu/gpl-2.0.xml
+	${xml_dir}/gnu/gpl-2.0.xml \
+	${xml_dir}/gnu/gpl-3.0.xml
 
 xml_sources = \
 	${xml_sources_basic} \
@@ -175,11 +183,7 @@ xml_sources = \
 xml_noinst = \
 	${xml_dir}/book.txml \
 	${xml_dir}/chapter.txml \
-	${xml_dir}/class.txml \
-	${xsl_dir}/doxygen2boostbook.xsl \
-	${xsl_dir}/boostbook2docbook.xsl \
-	${xsl_dir}/lookup.xsl
-
+	${xml_dir}/class.txml
 
 XSLTPROC       = xsltproc
 XSLTPROC_FLAGS = --nonet --xinclude
@@ -206,8 +210,8 @@ XMLLINT = xmllint
 #LINT_FLAGS = --debug --nonet --xinclude --nsclean --postvalid --nowarning
 #LINT_FLAGS = --noblanks --noout --xinclude --postvalid --noent
 LINT_FLAGS = --postvalid --debug --xinclude --noent --noblanks  --nonet --noout
-VALID_FLAGS = --dtdvalid http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
-XMLLINT_FLAGS = $(LINT_FLAGS) $(VALID_FLAGS)
+DTD_FLAGS = --dtdvalid http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
+XMLLINT_FLAGS = $(LINT_FLAGS) $(DTD_FLAGS)
 doc-xml-validate-docbook: $(xml_sources)
 	@echo "Generating XML validation log..."
 	$(XMLLINT) $(XMLLINT_FLAGS) ${top_srcdir}/doc/xml/spine.xml
@@ -281,6 +285,8 @@ doc-pdf-dblatex-docbook: $(xml_sources) ${docbook_outdir}/pdf
 	@echo "Generating pdf dblatex files..."
 	dblatex $(DBLATEX_FLAGS) ${top_srcdir}/doc/xml/spine.xml
 
+doc-pdf-docbook: doc-pdf-dblatex-docbook
+
 
 # Performance doc and graph configuration.
 # Assumes pychart, beautiful soup installed.
@@ -293,6 +299,7 @@ doc-html-performance:
 	${top_srcdir}/testsuite/data/make_graph_htmls.xml \
 	${top_srcdir}/testsuite/data/make_graph_test_infos.xml local g++)
 
+
 .PHONY: doc-doxygen-html doc-doxygen-man doc-performance
 
 # By adding these files here, automake will remove them for 'make clean'