From 2f3bdde7946ffbe607c345bc30ab7248a16a9447 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Tue, 29 Nov 2005 12:31:26 +0000 Subject: Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc from the gcc build directory. * Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc from the gcc build directory. * Makefile.in: Regenerate. gcc/ * Makefile.in (clean-target): Depend on clean-target-libgcc. (clean-target-libgcc): Import rule from the top-level Makefile.in. From-SVN: r107668 --- ChangeLog | 6 ++++++ Makefile.in | 8 ++------ Makefile.tpl | 8 ++------ gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 12 ++++++++++++ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9893ef..9282eee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-11-29 Ben Elliston + * Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc + from the gcc build directory. + * Makefile.in: Regenerate. + +2005-11-29 Ben Elliston + * Makefile.def: Add new libdecnumber host_module. Make all-gcc depend on all-libdecnumber. * configure.in (host_libs): Include libdecnumber. diff --git a/Makefile.in b/Makefile.in index a3f470c..e84c5d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2081,14 +2081,10 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean maintainer-clean: local-distclean realclean: maintainer-clean -# Extra dependency for clean-target, owing to the mixed nature of gcc +# Extra dependency for clean-target, owing to the mixed nature of gcc. clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc/libgcc || \ - (cd gcc/libgcc && find . -type d -print) | \ - while read d; do rm -f gcc/$$d/libgcc.a || : ; done - -rm -rf gcc/libgcc - -rm -f gcc/stmp-dirs + test ! -d gcc || (cd gcc && $(MAKE) $@) # Check target. diff --git a/Makefile.tpl b/Makefile.tpl index c99ba5b..4f38d6c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -839,14 +839,10 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean maintainer-clean: local-distclean realclean: maintainer-clean -# Extra dependency for clean-target, owing to the mixed nature of gcc +# Extra dependency for clean-target, owing to the mixed nature of gcc. clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc/libgcc || \ - (cd gcc/libgcc && find . -type d -print) | \ - while read d; do rm -f gcc/$$d/libgcc.a || : ; done - -rm -rf gcc/libgcc - -rm -f gcc/stmp-dirs + test ! -d gcc || (cd gcc && $(MAKE) $@) # Check target. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3d3a8d1..8aac20f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-11-29 Ben Elliston + + * Makefile.in (clean-target): Depend on clean-target-libgcc. + (clean-target-libgcc): Import rule from the top-level Makefile.in. + 2005-11-29 Kaveh R. Ghazi PR middle-end/20109 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 19e0d93..de573ca8 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3423,6 +3423,18 @@ fsf-funding.pod: funding.texi -$(TEXI2POD) $< > $@ # +# clean-target removes all files made by compilation. +# This can be added to over time. + +clean-target: clean-target-libgcc + +clean-target-libgcc: + test ! -d libgcc || \ + (cd libgcc && find . -type d -print) | \ + while read d; do rm -f $$d/libgcc.a || : ; done + test ! -d libgcc || rm -r libgcc + test ! -f stmp-dirs || rm stmp-dirs + # Deletion of files made during compilation. # There are four levels of this: # `mostlyclean', `clean', `distclean' and `maintainer-clean'. -- cgit v1.1