From: Damien Miller <djm@mindrot.org>
Date: Wed, 13 May 2020 02:08:34 +0000 (+1000)
Subject: explicitly manage .depend and .depend.bak
X-Git-Tag: V_8_3_P1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=102d106bc2e50347d0e545fad6ff5ce408d67247;p=thirdparty%2Fopenssh-portable.git

explicitly manage .depend and .depend.bak

Bring back removal of .depend to give the file a known state before
running makedepend, but manually move aside the current .depend file
and restore it as .depend.bak afterwards so the stale .depend check
works as expected.
---

diff --git a/Makefile.in b/Makefile.in
index 275d4dd78..7c5ed0bd6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -350,12 +350,15 @@ depend: depend-rebuild
 	rm -f .depend.bak
 
 depend-rebuild:
-	rm -f config.h
+	mv .depend .depend.old
+	rm -f config.h .depend
 	touch config.h .depend
 	makedepend -w1000 -Y. -f .depend *.c 2>/dev/null
 	(echo '# Automatically generated by makedepend.'; \
 	 echo '# Run "make depend" to rebuild.'; sort .depend ) >.depend.tmp
 	mv .depend.tmp .depend
+	rm -f .depend.bak
+	mv .depend.old .depend.bak
 	rm -f config.h
 
 depend-check: depend-rebuild