public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-6955] c++tools: Fix Makefile to properly clean and rebuild [PR101834]
@ 2023-03-31 9:39 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-03-31 9:39 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:79d1e0b2c2b8ff4f4b1118549a80945faa1cb356
commit r13-6955-g79d1e0b2c2b8ff4f4b1118549a80945faa1cb356
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Mar 30 13:03:11 2023 +0100
c++tools: Fix Makefile to properly clean and rebuild [PR101834]
The c++tools makefile doesn't remove progressively more files in each of
mostlyclean, clean, and distclean. Instead, each removes a different set
of files (and some files are not removed by any target). Use
prerequisites so that everything is removed.
Also, building in the $objdir/c++tools directory doesn't work, because
the INSTALL variable is never set. It works when building from the
top-level because INSTALL is set in the environment when recursively
invoking make for sub-directories.
c++tools/ChangeLog:
PR bootstrap/101834
* Makefile.in (INSTALL): Set variable.
(mostlyclean): Mark as a phony target.
(clean): Add mostlyclean as a prerequisite.
(distclean): Add clean as a prerequisite and remove more files.
(maintainer-clean): Add distclean as a prerequisite.
Diff:
---
c++tools/Makefile.in | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in
index 56cba090135..77bda3d56dc 100644
--- 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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-31 9:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-31 9:39 [gcc r13-6955] c++tools: Fix Makefile to properly clean and rebuild [PR101834] Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).