From f3653cf5bbc035d700f3d27dc12864d4d12c5d89 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Wed, 13 Apr 2016 20:02:08 +0200 Subject: [PATCH] Make distclean clean up more (PR70173) Currently, distclean does not remove the libcc1, gnattools, and gotools directories, and not the stage_final file either. Fix that. PR bootstrap/70173 * Makefile.tpl (local-distclean): Delete the libcc1, gnattools, and gotools directories. Delete the stage_final file. * Makefile.in: Regenerate. From-SVN: r234954 --- ChangeLog | 7 +++++++ Makefile.in | 5 +++-- Makefile.tpl | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cc46e52f74..a82e275ab62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-13 Segher Boessenkool + + PR bootstrap/70173 + * Makefile.tpl (local-distclean): Delete the libcc1, gnattools, + and gotools directories. Delete the stage_final file. + * Makefile.in: Regenerate. + 2016-04-12 Andre Vieira * MAINTAINERS (Write After Approval): Add myself. diff --git a/Makefile.in b/Makefile.in index a519a547533..1522e39ec5b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2316,7 +2316,7 @@ local-clean: local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag - -rm -f maybedep.tmp serdep.tmp + -rm -f maybedep.tmp serdep.tmp stage_final -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi @@ -2328,7 +2328,8 @@ local-distclean: -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null - -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null + -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null + -rmdir texinfo zlib 2>/dev/null -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null local-maintainer-clean: diff --git a/Makefile.tpl b/Makefile.tpl index 829f664ae00..6b2eb6aca50 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -810,7 +810,7 @@ local-clean: local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag - -rm -f maybedep.tmp serdep.tmp + -rm -f maybedep.tmp serdep.tmp stage_final -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi @@ -822,7 +822,8 @@ local-distclean: -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null - -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null + -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null + -rmdir texinfo zlib 2>/dev/null -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null local-maintainer-clean: