[Bug bootstrap/101834] make distclean forgets ./c++tools/

[redi at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101834

--- Comment #10 from Jonathan Wakely <redi at gcc dot gnu.org> ---
This seems like an improvement ...


--- a/c++tools/Makefile.in
+++ b/c++tools/Makefile.in
@@ -22,6 +22,7 @@ libexecdir := @libexecdir@
 target_noncanonical := @target_noncanonical@
 gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
 libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
 INSTALL_STRIP_PROGRAM := $(srcdir)/../install-sh -c -s
 AUTOCONF := @AUTOCONF@
@@ -41,13 +42,14 @@ all::
 mostlyclean::
        rm -f $(MAPPER.O)

-clean::
+clean:: mostlyclean
        rm -f g++-mapper-server$(exeext)

-distclean::
-       rm -f config.log config.status config.h
+distclean:: clean
+       rm -f config.log config.status config.h config.cache Makefile
+       rm -f $(MAPPER.O:%.o=%.d)

-maintainer-clean::
+maintainer-clean:: distclean

 install::

@@ -132,6 +134,6 @@ config.h: config.status config.h.in
 config.status: $(srcdir)/configure $(srcdir)/config.h.in
        if test -x $@; then ./$@ -recheck; else $< @configure_args@; fi

-.PHONY: all check clean distclean maintainer-clean
+.PHONY: all check mostlyclean clean distclean maintainer-clean

 -include $(MAPPER.O:.o=.d)