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:08:12 +0200 |
| commit | 886ef2b650768d8960e769707055eb79c32a0125 (patch) | |
| tree | 07ec76c20fa9a7db5786120271eb193cfd3fd96a | |
| parent | 8b89cb3307acb2e1056bfda56794a45abda278a5 (diff) | |
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 2cfc1aaa3b..2058ff405a 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 931c895774..17e1efbdff 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) |