[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6f45032f6730622e8d484d92e07c7fce7d1f88ac (commit)
      from  fdfe8b06ae97da3bc3a77aa3db00f8e0445f3c70 (commit)


- Log -----------------------------------------------------------------
commit 6f45032f6730622e8d484d92e07c7fce7d1f88ac
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri May 22 19:23:43 2015 +0200

    Missed a couple of spots in the update change
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org  |  2 +-
 apps/Makefile | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index ea9f6a0..9f72cdb 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -439,7 +439,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 ea78064..90e6014 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -123,14 +123,12 @@ tests:
 lint:
 	echo nope >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) -- $(EXE_SRC); \
-	fi
+depend: local_depend
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+local_depend:
+	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC); \
 
 dclean:
 	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new