From: Richard Levitte <levitte@openssl.org>
Date: Fri, 22 May 2015 17:23:43 +0000 (+0200)
Subject: Missed a couple of spots in the update change
X-Git-Tag: OpenSSL_1_0_0s~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=439c1934135c1f41fbef55592781cf4899efad94;p=oweals%2Fopenssl.git

Missed a couple of spots in the update change

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 6f45032f6730622e8d484d92e07c7fce7d1f88ac)

Conflicts:
	apps/Makefile
---

diff --git a/Makefile.org b/Makefile.org
index 465a13bec8..13ffc1528e 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -416,7 +416,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 c77615cdb2..863144c609 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