* Makefile.am (install-html, install-pdf): Add dummy targets.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134795 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 87f0c6f..1c9a17b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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

diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index c1649e4..7ab27f0 100644 (file)
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -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:

diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index d77cbc4..4835d08 100644 (file)
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -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:

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index 8f50008..3b2cfbb 100644 (file)
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -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

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index dc02af2..7ffe576 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -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: