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 97bb80f1d57226ada842baf9e7ed3d8b5e384d43..0b2b72d84ee7e2f2380ef35f34d237c2190d6d9c 100644 (file)
--- 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 821708be0b65bc1d8cafde68de71a536d6a275ed..963780f5d731239cae0b370e8cde25a0e81adf00 100644 (file)
--- 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