From b9864fd46ff583e019314855b7194df11c8a1050 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 18 Jun 2023 04:24:28 -0300 Subject: build: rename TOCLEAN and TODISTCLEAN variables To CLEANFILES and DISTCLEANFILES, respectively. This matches what GNU automake uses. Commands used to search and replace: $ git grep -IFlz -e TOCLEAN -e TODISTCLEAN | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \ -e 's/TOCLEAN/CLEANFILES/g' \ -e 's/TODISTCLEAN/DISTCLEANFILES/g' '{}')\" >'{}'" Added on commit cbdee6555 ("makefiles: add TOCLEAN and TODISTCLEAN variables", 2022-07-15) / PR #5478. --- src/prog.mk | 6 +++--- src/so.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/prog.mk b/src/prog.mk index 77ad0f65b..d138fc7ee 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define PROG and TARGET and may also want to -# define EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. +# define EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -33,7 +33,7 @@ $(PROG): $(OBJS) $(ROOT)/config.mk $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) .PHONY: clean -clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(TOCLEAN) +clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(TODISTCLEAN) +distclean: clean; rm -fr $(DISTCLEANFILES) diff --git a/src/so.mk b/src/so.mk index 446bf1100..f78f2aea6 100644 --- a/src/so.mk +++ b/src/so.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define SO and TARGET and may also want to define -# EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. +# EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -28,7 +28,7 @@ $(SO): $(OBJS) $(ROOT)/config.mk $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl .PHONY: clean -clean:; rm -fr $(OBJS) $(SO) *.plist $(TOCLEAN) +clean:; rm -fr $(OBJS) $(SO) *.plist $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(TODISTCLEAN) +distclean: clean; rm -fr $(DISTCLEANFILES) -- cgit v1.2.3-54-g00ecf