[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8b822d2566853ee5e313c37529f71336209b28ab (commit)
      from  6f45032f6730622e8d484d92e07c7fce7d1f88ac (commit)


- Log -----------------------------------------------------------------
commit 8b822d2566853ee5e313c37529f71336209b28ab
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat May 23 06:33:41 2015 +0200

    Fix update and depend in engines/
    
    The update: target in engines/ didn't recurse into engines/ccgost.
    The update: and depend: targets in engines/ccgost needed a fixup.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 engines/Makefile        | 1 +
 engines/ccgost/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/Makefile b/engines/Makefile
index eca15e2..e9dc1c4 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -136,6 +136,7 @@ lint:
 
 update: local_depend
 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+	@[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) )
 
 depend: local_depend
 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
index f3378aa..57b9c59 100644
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -64,10 +64,10 @@ install:
 tests:
 
 update: local_depend
-	@[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 depend: local_depend
-	@[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 local_depend:
 	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)