[openssh-commits] [openssh] 01/01: explicitly manage .depend and .depend.bak

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 102d106bc2e50347d0e545fad6ff5ce408d67247
Author: Damien Miller <djm at mindrot.org>
Date:   Wed May 13 12:08:34 2020 +1000

    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.
---
 Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 275d4dd7..7c5ed0bd 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.