diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/doc/Makefile.am | 9 | ||||
| -rw-r--r-- | libstdc++-v3/doc/Makefile.in | 9 |
5 files changed, 17 insertions, 16 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 87f0c6fed8c..1c9a17bb7f2 100644 --- 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 c1649e4a383..7ab27f0344d 100644 --- 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 d77cbc4b83f..4835d08349f 100644 --- 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 8f500088cb8..3b2cfbb0af7 100644 --- 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 dc02af2cd5f..7ffe5766ce1 100644 --- 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: |