diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-05-23 06:33:41 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-05-23 11:19:02 +0200 |
| commit | 591c819c301bf9e02333852aabf55d55813ae721 (patch) | |
| tree | 233d3f4af86976394ec962c1344fd48a87a2760f | |
| parent | 439c1934135c1f41fbef55592781cf4899efad94 (diff) | |
| download | openssl-591c819c301bf9e02333852aabf55d55813ae721.tar.gz | |
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)
| -rw-r--r-- | engines/Makefile | 1 | ||||
| -rw-r--r-- | engines/ccgost/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/Makefile b/engines/Makefile index a5b6e0fcc3..23bd2f37f8 100644 --- 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 248dd09ffc..a6836b3d9f 100644 --- 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) |