[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ea80a25e812520ebcaa437aec90ac2b9791df4b2 (commit)
      from  dca97e9bfdfbb62b9a4f664ee901a826bc338ad7 (commit)


- Log -----------------------------------------------------------------
commit ea80a25e812520ebcaa437aec90ac2b9791df4b2
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Feb 20 17:29:23 2016 +0100

    Avoid GNU make re-exec when adding dependencies to Makefile
    
    GNU make will re-exec if (it thinks that) the Makefile has changed.
    Just having the target Makefile seems to make it think it has, so we
    end up in a look where GNU make re-execs for ever.
    
    The fix is easy, just remove the Makefile target and have the depend
    target run the recipe on its own instead of depending on Makefile.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 3170e51..47608f7 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -249,8 +249,7 @@ clean: libclean
 	rm -f $(TARFILE)
 
 # This exists solely for those who still type 'make depend'
-depend: Makefile
-Makefile: FORCE
+depend:
 	@( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \
 	  echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \
 	  echo; \