diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 26 |
3 files changed, 28 insertions, 11 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d5a6f03..f52bad9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2006-07-05 Benjamin Kosnik <bkoz@redhat.com> + + * include/Makefile.am (pch_output): New. + (clean-local): Use it. + * include/Makefile.in: Regenerate. + 2006-07-04 Paolo Carlini <pcarlini@suse.de> * include/tr1/random (_Adaptor<>::operator()()): Cast 1 to diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index dbaae32..18c7a3d 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -779,6 +779,7 @@ pch3_output_installdir = ${host_installdir}/extc++.h.gch pch3_source = ${glibcxx_srcdir}/include/precompiled/extc++.h pch_input = ${pch1_input} ${pch2_input} ${pch3_input} +pch_output = ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir} PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) if GLIBCXX_BUILD_PCH pch_build = ${pch_input} @@ -1171,7 +1172,11 @@ install-pch: $(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done # By adding these files here, automake will remove them for 'make clean' -CLEANFILES = ${pch_input} ${pch_output_builddir}/* +CLEANFILES = ${pch_input} + +# To remove directories. +clean-local: + rm -rf ${pch_output} # Stop implicit '.o' make rules from ever stomping on extensionless # headers, in the improbable case where some foolish, crack-addled diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 184cc80..1d990d3 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -991,6 +991,7 @@ pch3_output_builddir = ${host_builddir}/extc++.h.gch pch3_output_installdir = ${host_installdir}/extc++.h.gch pch3_source = ${glibcxx_srcdir}/include/precompiled/extc++.h pch_input = ${pch1_input} ${pch2_input} ${pch3_input} +pch_output = ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir} PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) @GLIBCXX_BUILD_PCH_FALSE@pch_build = @GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_input} @@ -1016,7 +1017,7 @@ allcreated = \ uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_] # By adding these files here, automake will remove them for 'make clean' -CLEANFILES = ${pch_input} ${pch_output_builddir}/* +CLEANFILES = ${pch_input} all: all-am .SUFFIXES: @@ -1124,7 +1125,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool mostlyclean-am +clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -1169,14 +1170,15 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am + clean-libtool clean-local distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am # Here are the rules for building the headers @@ -1536,6 +1538,10 @@ install-pch: for file in ${pch2_output_builddir}/*; do \ $(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done +# To remove directories. +clean-local: + rm -rf ${pch_output} + # Stop implicit '.o' make rules from ever stomping on extensionless # headers, in the improbable case where some foolish, crack-addled # developer tries to create them via make in the include build |