Fix the update target and remove duplicate file updates

We had updates of certain header files in both Makefile.org and the
Makefile in the directory the header file lived in.  This is error
prone and also sometimes generates slightly different results (usually
just a comment that differs) depending on which way the update was
done.

This removes the file update targets from the top level Makefile, adds
an update: target in all Makefiles and has it depend on the depend: or
local_depend: targets, whichever is appropriate, so we don't get a
double run through the whole file tree.

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

Conflicts:
	Makefile.org
	apps/Makefile
	test/Makefile
	crypto/cmac/Makefile
	crypto/srp/Makefile

diff --git a/Makefile.org b/Makefile.org
index 808b99e63a92ab6dcefd3e0aad5b3a2a41ace43b..465a13bec8b96fed9b7967c27eb7fc5ae628d1f2 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -416,6 +416,9 @@ tests: rehash
 report:
        @$(PERL) util/selftest.pl
 
+update: errors stacks util/libeay.num util/ssleay.num apps/openssl-vms.cnf TABLE
+       @set -e; target=update; $(RECURSIVE_BUILD_CMD)
+
 depend:
        @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
 
@@ -440,26 +443,10 @@ util/libeay.num::
 util/ssleay.num::
        $(PERL) util/mkdef.pl ssl update
 
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
-       $(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
-       $(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
-crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num
-       $(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h
-
-apps/openssl-vms.cnf: apps/openssl.cnf
-       $(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
-
-crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
-       $(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
-
-
 TABLE: Configure
        (echo 'Output of `Configure TABLE'"':"; \
        $(PERL) Configure TABLE) > TABLE
 
-update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
-
 # Build distribution tar-file. As the list of files returned by "find" is
 # pretty long, on several platforms a "too many arguments" error or similar
 # would occur. Therefore the list of files is temporarily stored into a file

diff --git a/apps/Makefile b/apps/Makefile
index fa32d2d7e71b02e872549151aed4a8826ad9ff03..c77615cdb25ccd4b691c78a6a0b2dd12a6b9727b 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -94,6 +94,9 @@ req: sreq.o $(A_OBJ) $(DLIBCRYPTO)
 sreq.o: req.c 
        $(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c
 
+openssl-vms.cnf: openssl.cnf
+       $(PERL) $(TOP)/VMS/VMSify-conf.pl < openssl.cnf > openssl-vms.cnf
+
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -127,6 +130,8 @@ links:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: openssl-vms.cnf depend
+
 depend:
        @if [ -z "$(THIS)" ]; then \
            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \

diff --git a/crypto/Makefile b/crypto/Makefile
index d6bc8e43cb020b0ccfd0bc253c2b55e2765f3e5b..6524ad2bad87697782a11b24e92cf55aeae020e9 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -121,12 +121,17 @@ install:
 lint:
        @target=lint; $(RECURSIVE_MAKE)
 
-depend:
+update: local_depend
+       @[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) )
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+depend: local_depend
+       @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+local_depend:
        @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
        @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
        @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h
-       @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 clean:
        rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index c501a43a8f6b703df54bdb5a4ce246686883822c..fb70030711e72c45c2e1d2dd6ac1a180137eebee 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -87,6 +87,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile
index 160544eede589236bec3671366ca0d1642322b51..6d874d64edc14724e467210c057e4d7f05ecd193 100644 (file)
--- a/crypto/asn1/Makefile
+++ b/crypto/asn1/Makefile
@@ -93,6 +93,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile
index dd2c2c708e63fd1295e081d1b5797bfb10895f9a..e0e4ee9595e4ac4456a6f0f8dc226bbf323a9bb9 100644 (file)
--- a/crypto/bf/Makefile
+++ b/crypto/bf/Makefile
@@ -72,6 +72,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile
index c395d804968166b8dc1eef168e4b014f122cae03..ef526f6beb2c2b9e875da123a424d90d4ab5db1f 100644 (file)
--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@@ -73,6 +73,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index aabc4f56b8e6dd057ff821e09e4f66ea9692a0b2..02c2e0d1d6aa0606a652e1b8cc387e248f6aad11 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -142,6 +142,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: bn_prime.h depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile
index 9f3a88d2d6a13e37a44e558dbfce52673efe9c2c..9355e700429e714b04c462bd9c1ab92a731874c5 100644 (file)
--- a/crypto/buffer/Makefile
+++ b/crypto/buffer/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile
index ff5fe4a01dba4da9aa6697cf3b1c0d61147b3355..e8f166dc7b6b44f88b570058956e533487f26eae 100644 (file)
--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@@ -73,6 +73,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile
index 0acc38f28d542497b626ff613d4cd45fb12286b0..acce5a33c50343bf3a15b7344e5032034889117a 100644 (file)
--- a/crypto/cast/Makefile
+++ b/crypto/cast/Makefile
@@ -69,6 +69,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile
index 5837049725dbd3856d7a66287428fa637a237125..90da8e42c79bfe7db4c58431f4821a2948a31425 100644 (file)
--- a/crypto/cms/Makefile
+++ b/crypto/cms/Makefile
@@ -65,6 +65,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile
index efda832dce47f3b22eaa8938e323dc34112d45dc..a1e9464a11f7ea67302035da853bb4acac778e7d 100644 (file)
--- a/crypto/comp/Makefile
+++ b/crypto/comp/Makefile
@@ -64,6 +64,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/conf/Makefile b/crypto/conf/Makefile
index 78bb3241065d869bd706e44991c92a129a76a298..d5f5c582414beb9d56d916dea4bf0fbefcff51ae 100644 (file)
--- a/crypto/conf/Makefile
+++ b/crypto/conf/Makefile
@@ -64,6 +64,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/des/Makefile b/crypto/des/Makefile
index ae982265fde004769472492c4a2df4f502112003..035b83616572006b3e4c71416fb3ebf70e8db968 100644 (file)
--- a/crypto/des/Makefile
+++ b/crypto/des/Makefile
@@ -94,6 +94,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile
index f23b4f7fde84e8c874479571c122cabda9ae491f..6d574f407d396b142e9c81b9e897c60a1d257292 100644 (file)
--- a/crypto/dh/Makefile
+++ b/crypto/dh/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile
index 8073c4ecfed7bea6e5ed92760fa5da6dc7d767c4..682772a79bfe0ff76685d37e76aa207d0a175bdb 100644 (file)
--- a/crypto/dsa/Makefile
+++ b/crypto/dsa/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/dso/Makefile b/crypto/dso/Makefile
index fb2709ed63a7601f5fe86ab6e6dec60c00abb7cb..36b8ead041c34d26c6bf4977c41efb11988b8b23 100644 (file)
--- a/crypto/dso/Makefile
+++ b/crypto/dso/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index db380ed16f8425bf73b9d547116e1da0247f9f02..a5f7cad956e89f14b87d7ddedf4e5e92f1e9c0c0 100644 (file)
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -66,6 +66,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile
index 65d8904ee8a61e0f159f688fc2cdff103ce38bb7..e456e96c970326214352e875517c059366527beb 100644 (file)
--- a/crypto/ecdh/Makefile
+++ b/crypto/ecdh/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index e89e0c010c6b93bc19ab7c7c8c94a288b395f5ae..4ce00e8f93085186f53e0eeca7df9af5f3bfecac 100644 (file)
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile
index 9c214824eb2f76212b664c3dde10138c931ae965..fa27f3e7310c7c39410fbd634806dce3e33a54f1 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/Makefile
@@ -69,6 +69,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/err/Makefile b/crypto/err/Makefile
index 862b23ba1768b63289cdaafb0e6452ea66a41a29..b6f3ef1778d16957b5a0e27a339dfa8f121ae6cf 100644 (file)
--- a/crypto/err/Makefile
+++ b/crypto/err/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 82825e5299e3b7a3eb645519eb99144c28ade7d1..8fe3c0225235d27869833211973c39ce0acb0413 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -84,6 +84,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/hmac/Makefile b/crypto/hmac/Makefile
index 0e91709f64ca31c45a6c5f3e99bb443ccc5899ab..52e39e586075e204996504f8b610ea8297bc842d 100644 (file)
--- a/crypto/hmac/Makefile
+++ b/crypto/hmac/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/idea/Makefile b/crypto/idea/Makefile
index b2e7add666affef555a9247ae9fda0f295fbee23..3463d03e20bf006d6f1e4beed373f1e2de1b8167 100644 (file)
--- a/crypto/idea/Makefile
+++ b/crypto/idea/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile
index 110c49ce0b4a84903a4ccc551941d7792d682422..5193fd9835330030a79c10958fcae2307cd278fc 100644 (file)
--- a/crypto/jpake/Makefile
+++ b/crypto/jpake/Makefile
@@ -32,6 +32,8 @@ install:
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/krb5/Makefile b/crypto/krb5/Makefile
index 14077390d6923dfac00f407ae60ca2186d9fb4bb..8b9a01a296c12ebb866dccf0f4f38cb3a33093e0 100644 (file)
--- a/crypto/krb5/Makefile
+++ b/crypto/krb5/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/lhash/Makefile b/crypto/lhash/Makefile
index 82bddac474503034f5572a93d03b851e929cd15b..c7f4365f0ab9bf7215c274a1dbcf56f5daafcd60 100644 (file)
--- a/crypto/lhash/Makefile
+++ b/crypto/lhash/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/md2/Makefile b/crypto/md2/Makefile
index 17f878aeb7d464780d91cb7ff240d4987d4b7fed..b63011085f894011eaa6a1d17fd499095b914181 100644 (file)
--- a/crypto/md2/Makefile
+++ b/crypto/md2/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/md4/Makefile b/crypto/md4/Makefile
index c94a1398ed0f019f3326fc80f9a66434ebbe6348..c810182c3ae2ebf446f6b069d058ad311d1b3e20 100644 (file)
--- a/crypto/md4/Makefile
+++ b/crypto/md4/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/md5/Makefile b/crypto/md5/Makefile
index 9858d53d31e2e15a02526edcad8cab9db9ecec93..67d8ac645cc001020ce34964cf73f68a1b68c1ae 100644 (file)
--- a/crypto/md5/Makefile
+++ b/crypto/md5/Makefile
@@ -76,6 +76,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile
index 1d064f17a6279f8f719ac08e3ed629a9b75118fb..28e8bc30c9de384c90b05bbec3f416eece451739 100644 (file)
--- a/crypto/mdc2/Makefile
+++ b/crypto/mdc2/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
index 6c85861b6c56f4c744a563c35236109c85161f2c..20add64b837055e89b1510f1e003b86bc8563a4a 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile
index a8aedbd422870c28d0e9f8a2ba5723d14a7f0451..f93d2f9d26473d995045a619c57879029647c1d6 100644 (file)
--- a/crypto/objects/Makefile
+++ b/crypto/objects/Makefile
@@ -74,6 +74,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: obj_dat.h obj_mac.h obj_xref.h depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ocsp/Makefile b/crypto/ocsp/Makefile
index 60c414cf4da605735f4fc135acc96705a6ab20ca..96a1b156b9fb909f422beb660361f6bf360a02a7 100644 (file)
--- a/crypto/ocsp/Makefile
+++ b/crypto/ocsp/Makefile
@@ -64,6 +64,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/pem/Makefile b/crypto/pem/Makefile
index 2cc7801529e0fa40bb77068e792e02dd38efbc4c..7a930eeae77427faa0805e3d7a08507cfb60ecb3 100644 (file)
--- a/crypto/pem/Makefile
+++ b/crypto/pem/Makefile
@@ -64,6 +64,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)

diff --git a/crypto/pkcs12/Makefile b/crypto/pkcs12/Makefile
index 3a7498fe7ad99a11da2eaf3be46a137c26c30f53..be5f8c5d21dfbdcb05e51ee80f2d7adf65962175 100644 (file)
--- a/crypto/pkcs12/Makefile
+++ b/crypto/pkcs12/Makefile
@@ -67,6 +67,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/pkcs7/Makefile b/crypto/pkcs7/Makefile
index effe05fc043d3c66e53fae942dbb1a6bce95e9c8..decf5e0203e86edb2336218b286c04a47d2475d9 100644 (file)
--- a/crypto/pkcs7/Makefile
+++ b/crypto/pkcs7/Makefile
@@ -68,6 +68,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/pqueue/Makefile b/crypto/pqueue/Makefile
index fb36a0c876e3c1605ab3b035cdca41a8de24de35..a59b5a9395b224e0686365eb73f053d6b7ff01d5 100644 (file)
--- a/crypto/pqueue/Makefile
+++ b/crypto/pqueue/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/rand/Makefile b/crypto/rand/Makefile
index 27694aa66498935d1327697c9c8a0a3035891476..df44369a0823774ec3e244d80087f82c215a1d01 100644 (file)
--- a/crypto/rand/Makefile
+++ b/crypto/rand/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/rc2/Makefile b/crypto/rc2/Makefile
index 73eac347e7fdf96324a0c4cc0bd0a88750fb77c6..2348ab8e4d28e7663a25ccf34546584dedba50b6 100644 (file)
--- a/crypto/rc2/Makefile
+++ b/crypto/rc2/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/rc4/Makefile b/crypto/rc4/Makefile
index 264451a213f9db1b53a3b4ddd3611042049c236a..f1a5d3abd6656a8ab6fffa53e20267aee9c664c9 100644 (file)
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -84,6 +84,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile
index 8a8b00eb89e6038b912ff722dd8a56713e5f82e8..6ca0037c681b84143cd53e31d674e1490f25bf1b 100644 (file)
--- a/crypto/rc5/Makefile
+++ b/crypto/rc5/Makefile
@@ -69,6 +69,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ripemd/Makefile b/crypto/ripemd/Makefile
index d5b1067dbeb2aba9e774759940464f4e563f9613..464169d881ee863f7a2f9f7cc80972ae8b61985f 100644 (file)
--- a/crypto/ripemd/Makefile
+++ b/crypto/ripemd/Makefile
@@ -69,6 +69,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/rsa/Makefile b/crypto/rsa/Makefile
index 7c6bc00780652203465edeab709f5924eb6f3843..22c0793ec224012ac394682763997699a601cf29 100644 (file)
--- a/crypto/rsa/Makefile
+++ b/crypto/rsa/Makefile
@@ -67,6 +67,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/seed/Makefile b/crypto/seed/Makefile
index 4bc55e4916491bdd3a0c80a9be27424a0091705f..70d3d45a2be816536825f3dfe0f88648927de575 100644 (file)
--- a/crypto/seed/Makefile
+++ b/crypto/seed/Makefile
@@ -62,6 +62,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
index e6eccb05f9777d7848e52ee292129c743cb27a60..84391427016ead6807239cad605a36ff72de7cf7 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -100,6 +100,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/stack/Makefile b/crypto/stack/Makefile
index 5327692ac895cef5a4ae6abb620cd43c01326b07..b069c93237aecea39a26be4ded14dfc535215523 100644 (file)
--- a/crypto/stack/Makefile
+++ b/crypto/stack/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/store/Makefile b/crypto/store/Makefile
index 0dcfd7857a37713f2959dcbd366246deb2943698..5bc7ca71f03cde85d2eb9cb6f3d3c218491e6631 100644 (file)
--- a/crypto/store/Makefile
+++ b/crypto/store/Makefile
@@ -63,6 +63,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile
index c18234555be300a4d89ca7c1d6ddfa8c8cb3325e..cf991efe464199f14defb3124b47888cd100cc95 100644 (file)
--- a/crypto/ts/Makefile
+++ b/crypto/ts/Makefile
@@ -73,6 +73,8 @@ tags:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 

diff --git a/crypto/txt_db/Makefile b/crypto/txt_db/Makefile
index e6f30331d8dd2f72395e7a50a64c97f07bbd479e..4f70b199a5d483e4b59742f99616f8953f9d8e92 100644 (file)
--- a/crypto/txt_db/Makefile
+++ b/crypto/txt_db/Makefile
@@ -61,6 +61,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile
index a685659fb4c88466d0e1e384ca81edfe43bbe976..b28fcca6d9653b74718a48bf92351d6c8706e45c 100644 (file)
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -65,6 +65,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile
index 566b996290511e98111834ee811775dd8de1b43c..308bbb0781abdc4deb9bed914350e0366f0ef0ca 100644 (file)
--- a/crypto/whrlpool/Makefile
+++ b/crypto/whrlpool/Makefile
@@ -74,6 +74,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/x509/Makefile b/crypto/x509/Makefile
index 72c82278f43ddc26cb496f515408b6dae7302c21..af3c25514049d2a766b5a4a5f4c3ac8ade2d9b28 100644 (file)
--- a/crypto/x509/Makefile
+++ b/crypto/x509/Makefile
@@ -71,6 +71,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/crypto/x509v3/Makefile b/crypto/x509v3/Makefile
index 556ef351bf888cac13c72af59043e7065943e636..05125aba2782e3f8a2452368884a8376b51dcb17 100644 (file)
--- a/crypto/x509v3/Makefile
+++ b/crypto/x509v3/Makefile
@@ -71,6 +71,8 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)

diff --git a/engines/Makefile b/engines/Makefile
index 2fa9534401b1a1be2b811d08b7a15a835b78df05..a5b6e0fcc369ff7264ab030ec7c3bd719f8c5e51 100644 (file)
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -146,12 +146,14 @@ lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
        @target=lint; $(RECURSIVE_MAKE)
 
-depend:
-       @if [ -z "$(THIS)" ]; then \
-           $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-       fi
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+update: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+depend: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
        @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
+local_depend:
+       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
index dadb5230ecd4595923b3c58878d0330e06f23f18..248dd09ffcc1937377fedb499c763963737f1eb5 100644 (file)
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -66,12 +66,13 @@ links:
 
 tests:
 
-depend:
-       @if [ -z "$(THIS)" ]; then \
-           $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-       else \
-           $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \
-       fi
+update: local_depend
+       @[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+
+depend: local_depend
+       @[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+local_depend:
+       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 files:
 

diff --git a/ssl/Makefile b/ssl/Makefile
index cd0c37d188ebefde5bb1d9a2339d352bfe1498ef..f429e3af4e0440ee5237b4c25055d97d90ca05a1 100644 (file)
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -89,12 +89,13 @@ tests:
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
-depend:
-       @if [ -z "$(THIS)" ]; then \
-           $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-       else \
-           $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \
-       fi
+update: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+depend: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+local_depend:
+       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

diff --git a/test/Makefile b/test/Makefile
index 956694543db657f7e2819726c73f84fa9c460ab8..3fe5f193d910134fe5ebdc1d5db0d9f2ac7e166d 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -321,12 +321,13 @@ test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
-depend:
-       @if [ -z "$(THIS)" ]; then \
-           $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
-       else \
-           $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC); \
-       fi
+update: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+
+depend: local_depend
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+local_depend:
+       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
 
 dclean:
        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

diff --git a/tools/Makefile b/tools/Makefile
index bb6fb71f3eb8a78173040442643383c09a51ac9b..c1a2f6bccf54a409854b762f4b0dd43b2906086d 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -44,6 +44,8 @@ tags:
 
 errors:
 
+update: depend
+
 depend:
 
 dclean: