diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-05-22 19:23:43 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-05-23 06:25:12 +0200 |
| commit | 8b89cb3307acb2e1056bfda56794a45abda278a5 (patch) | |
| tree | 466171659b25e72c5bd04e216bc56df5794722da | |
| parent | bf423546200bd748277f79235cb0cdb7ca0e4a2c (diff) | |
Missed a couple of spots in the update change
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 6f45032f6730622e8d484d92e07c7fce7d1f88ac)
Conflicts:
apps/Makefile
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | apps/Makefile | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.org b/Makefile.org index 97bb80f1d5..0b2b72d84e 100644 --- a/Makefile.org +++ b/Makefile.org @@ -457,7 +457,7 @@ tests: rehash report: @$(PERL) util/selftest.pl -update: errors stacks util/libeay.num util/ssleay.num apps/openssl-vms.cnf TABLE +update: errors stacks util/libeay.num util/ssleay.num TABLE @set -e; target=update; $(RECURSIVE_BUILD_CMD) depend: diff --git a/apps/Makefile b/apps/Makefile index 821708be0b..963780f5d7 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -130,14 +130,12 @@ links: lint: lint -DLINT $(INCLUDES) $(SRC)>fluff -update: openssl-vms.cnf depend +update: openssl-vms.cnf local_depend -depend: - @if [ -z "$(THIS)" ]; then \ - $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \ - else \ - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \ - fi +depend: local_depend + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi +local_depend: + @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC); \ dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new |