From 886ef2b650768d8960e769707055eb79c32a0125 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 23 May 2015 06:33:41 +0200 Subject: [PATCH] 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 (cherry picked from commit 8b822d2566853ee5e313c37529f71336209b28ab) --- engines/Makefile | 1 + 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) -- 2.25.1