From 82f344a04be0acffee414e5d58f549d7e4d53ece Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 13 Sep 2019 11:54:03 +0100
Subject: [PATCH] build: distclean now recursively removes patch files and
 related

---
 Makefile                   | 2 ++
 hooks/Makefile             | 3 +++
 src/Makefile               | 1 +
 tests/Makefile             | 4 ++++
 tests/crypt/Makefile       | 1 +
 tests/eloop-bench/Makefile | 1 +
 6 files changed, 12 insertions(+)

diff --git a/Makefile b/Makefile
index dcd4624c..6e16ccef 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,8 @@ clean:
 distclean: clean
 	rm -f config.h config.mk config.log \
 		${DISTFILE} ${DISTFILEGZ} ${DISTINFO} ${DISTINFOSIGN}
+	rm -f *.diff *.patch *.orig *.rej
+	for x in ${SUBDIRS} tests; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done
 
 dist-git:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | xz >${DISTFILE}
diff --git a/hooks/Makefile b/hooks/Makefile
index e8fb70a8..c1332e58 100644
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -36,6 +36,9 @@ all: ${PROG} ${MAN8} ${SCRIPTS} ${EGHOOKSCRIPTS}
 clean:
 	rm -f ${CLEANFILES} 50-ypbind
 
+distclean: clean
+	rm -f *.diff *.patch *.orig *.rej
+
 depend:
 
 proginstall: ${PROG} ${HOOKSCRIPTS}
diff --git a/src/Makefile b/src/Makefile
index fa928728..8581159b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -134,6 +134,7 @@ clean:
 
 distclean: clean
 	rm -f .depend
+	rm -f *.diff *.patch *.orig *.rej
 
 _import-src: ${SRCS}
 	${INSTALL} -d ${DESTDIR}/src
diff --git a/tests/Makefile b/tests/Makefile
index 1ae0a8b2..16a229ff 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -10,6 +10,10 @@ proginstall:
 clean:
 	for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done
 
+distclean: clean
+	rm -f *.diff *.patch *.orig *.rej
+	for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done
+
 test:
 	for x in ${SUBDIRS}; do cd $$x; ${MAKE} $@ || exit $$?; cd ..; done
 
diff --git a/tests/crypt/Makefile b/tests/crypt/Makefile
index 9b2a3231..db23f710 100644
--- a/tests/crypt/Makefile
+++ b/tests/crypt/Makefile
@@ -24,6 +24,7 @@ clean:
 
 distclean: clean
 	rm -f .depend
+	rm -f *.diff *.patch *.orig *.rej
 
 .depend: ${SRCS} ${PCRYPT_SRCS}
 	${CC} ${CPPFLAGS} -MM ${SRCS} ${PCRYPT_SRCS}
diff --git a/tests/eloop-bench/Makefile b/tests/eloop-bench/Makefile
index a0d30983..332e889f 100644
--- a/tests/eloop-bench/Makefile
+++ b/tests/eloop-bench/Makefile
@@ -34,6 +34,7 @@ clean:
 
 distclean: clean
 	rm -f .depend
+	rm -f *.diff *.patch *.orig *.rej
 
 depend:
 
-- 
2.47.2