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@openssl.org>
(cherry picked from commit 8b822d2566853ee5e313c37529f71336209b28ab)

diff --git a/engines/Makefile b/engines/Makefile
index a5b6e0fcc369ff7264ab030ec7c3bd719f8c5e51..23bd2f37f89c92294b4071ef8204e32709696e05 100644 (file)
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -148,6 +148,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 248dd09ffcc1937377fedb499c763963737f1eb5..a6836b3d9fa02e81a48bd41ba9b5a7875865d65f 100644 (file)
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -67,10 +67,10 @@ links:
 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)