Makefile.am (install-html, [...]): Add dummy targets.

* Makefile.am (install-html, install-pdf): Add dummy targets.
	* Makefile.in: Regenerate.
	* doc/Makefile.am (install-html, install-pdf): Remove.
	* doc/Makefile.in: Regenerate.

From-SVN: r134795
This commit is contained in:
Joseph Myers 2008-04-29 16:30:56 +01:00 committed by Joseph Myers
parent 81ad578ea1
commit c4e82de92e
5 changed files with 17 additions and 16 deletions

View File

@ -1,3 +1,10 @@
2008-04-29 Joseph Myers <joseph@codesourcery.com>
* Makefile.am (install-html, install-pdf): Add dummy targets.
* Makefile.in: Regenerate.
* doc/Makefile.am (install-html, install-pdf): Remove.
* doc/Makefile.in: Regenerate.
2008-04-28 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config: Move os_defines and cpu_defines after

View File

@ -89,3 +89,7 @@ AM_MAKEFLAGS = \
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
.PHONY: install-html install-pdf
install-html:
install-pdf:

View File

@ -797,6 +797,10 @@ doc-%:
# All the machinations with string instantiations messes up the
# automake-generated TAGS rule. Make a simple one here.
TAGS: tags-recursive $(LISP)
.PHONY: install-html install-pdf
install-html:
install-pdf:
# 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.
.NOEXPORT:

View File

@ -226,14 +226,7 @@ doc-pdf-prince: $(xml_sources) ${glibcxx_builddir}/doc/pdf
$(PRINCE) $(PRINCE_FLAGS) ${top_srcdir}/doc/xml/spine.xml
# No install-pdf, install-html support in automake yet
install-pdf:
install-html:
# Installation of distribution html documentation not yet supported
# TODO: Write custom install-html rule.
.PHONY: install-html install-pdf \
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'
CLEANFILES = *.log

View File

@ -639,14 +639,7 @@ doc-pdf-prince: $(xml_sources) ${glibcxx_builddir}/doc/pdf
@echo "Generating pdf prince files..."
$(PRINCE) $(PRINCE_FLAGS) ${top_srcdir}/doc/xml/spine.xml
# No install-pdf, install-html support in automake yet
install-pdf:
install-html:
# Installation of distribution html documentation not yet supported
# TODO: Write custom install-html rule.
.PHONY: install-html install-pdf \
doc-doxygen-html doc-doxygen-man doc-performance
.PHONY: doc-doxygen-html doc-doxygen-man doc-performance
# To remove directories.
clean-local: