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

diff --git a/Makefile.org b/Makefile.org
index c92806f9201fe56a75a0bf28fcd997119dd13ae2..f38ea7a365b1b1b16799a1df4ba70a62542d7f10 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -459,6 +459,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)
 
@@ -483,26 +486,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 72657ea658733c305028f2de7cd12f2485372416..821708be0b65bc1d8cafde68de71a536d6a275ed 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 2355661f40fa31c286c304d227a6b4aa81728382..618c95878ce42e16f695e630ae1f3ddf8944714b 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -125,12 +125,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 45ede0a0b459c6bdf827220ede45c45e3724d348..b3a95812af3bb64ea0a3dcda7cee793692304841 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -106,6 +106,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 f7787005d454ab752afe42e970522a7e727a1a26..d774f7821238c6b1efcfefa6dc0e5bc6dabeb1ee 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 d01bfaa31558dd4e77e5a85c71397262cd978c2d..6dd2015537fe0e1f13ed2a297321253ac74812a9 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 6dd136be5d6b7f3d715480158b3955b9b3733217..3d0158c15aead18c502f7535e088bcb227565cfa 100644 (file)
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -167,6 +167,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 2efba47f07002c7552db21854b7d8e2e7a8a454f..352efb841ffbc40edeac5801cc36b965c24c9150 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 6ce6fc99cd20f0286bbd25737684b908a97d6bd2..228f1dc713d56f0d56088d708817b662d6e8504f 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 f3f4859886a6ce9855e1e786c2fc0e6edd6106e3..4c4b5e9baa551325919cdc369777ef6a25550c01 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/cmac/Makefile b/crypto/cmac/Makefile
index 54e7cc39d52b923b4e1a6199882819839645f661..6a2840867643c4eee7a30cf84a8e4af3086b9c3a 100644 (file)
--- a/crypto/cmac/Makefile
+++ b/crypto/cmac/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/cms/Makefile b/crypto/cms/Makefile
index 9820adb21278bf85d6f28bf9d5683c8bd9833a60..b124b5dbf212e2be5da20020ebdfe128353ab6c8 100644 (file)
--- a/crypto/cms/Makefile
+++ b/crypto/cms/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/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 a6e1001329a5338dc0f9e205297335392706af2e..fbc77c163cd396b4bfb9131ee4421c87d76df186 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 5fef4ca5adfc5382873c5bf2cc0e00b510b4a724..81092013773f75f435fbe8f1f24eae73e34fb914 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 f85fc845ca2b31ef24e2826f0cfde5b545ff5ee3..2753b28bec0a5a945682f7eeadd35ff20c1f2a46 100644 (file)
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -70,6 +70,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 ba05fea05ca04e40b2347c723740e997740dae9a..f0766356a132286ff40a181301b3dc26df3ca473 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 d29bdd09a096734b94d7d0b1cf070699a3415fd7..8ceb747fabdcc3a8b1a861c60c8f9649e659b8e4 100644 (file)
--- a/crypto/engine/Makefile
+++ b/crypto/engine/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/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 ef75678ad84d10104d95618ae91ca39610ea4fa6..ed1502d3a6946a065aa7b14c252c75d7b572f6a7 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -86,6 +86,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 8af0acdad97249c9b56441b1fa8642bc1ae399aa..3dc23e48dd4269fd52dfb7c369f7955b79c53e2a 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 e6f1e4478c048d2f05eb3016d9bec0ed3393510c..3ee436176ba6837159611c449403de73209777b7 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 b9e2ce9a386af741df2a854ae8f85711b820065c..0f87dbd54230e7eaeb39ddef2a8ebeb1f2919ed4 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 141553149d54706d623a3dae92c733d96e7cc6d6..c2d0c5b7cd580fb49fa7e343b3f75e4a69dbd88a 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 3d8bafd5716c8242766a3b9e4e382a4b03ef530f..e278fa6a2528e20a6bb481cc190015e8e6d5c7cd 100644 (file)
--- a/crypto/modes/Makefile
+++ b/crypto/modes/Makefile
@@ -89,6 +89,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 8a9d49ab5eb8b2b5ee9a541b80c1da82d80d44a9..b3727a4a6d47556fa1f48bdafe55dec056cf0ba6 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 1614d479619f10dc79763d54d587e56dbe3285dc..f3d6e0dc0405d6430930b31f9a4ffaf5df33dc8e 100644 (file)
--- a/crypto/rc4/Makefile
+++ b/crypto/rc4/Makefile
@@ -89,6 +89,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 25140b2a73e212108bde492ff4acc6f82f945336..1c3f094bb0882d9896774bc0e97452eaa93faf46 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 e8121a496750636a582c8e2ff9b19409eb40a492..79c7c421bc09c77d3f76613b41d8606b452275a3 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 2eb2b7af992bf6897e42b744e1139febb12b17ab..ceb8094b0cba0e031b7af303e8e4aacb08c3b619 100644 (file)
--- a/crypto/sha/Makefile
+++ b/crypto/sha/Makefile
@@ -117,6 +117,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/srp/Makefile b/crypto/srp/Makefile
index 41859d46fa7f4c1ab5c7e58fd9629e8162b0b17f..763953384b199339df798eaaed872c5dba0a0772 100644 (file)
--- a/crypto/srp/Makefile
+++ b/crypto/srp/Makefile
@@ -61,6 +61,8 @@ srptest: top srptest.c $(LIB)
 lint:
        lint -DLINT $(INCLUDES) $(SRC)>fluff
 
+update: depend
+
 depend:
        $(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 f4d46e4d17b79e73c6c79732eefa31f1da4e1faa..befd6d6f36efb03ac31ff5889ee1552c04785ab5 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 c246f232c9c92e7e75ee10afea75665ea7c589e0..18e7cd53c9c841b295691bde5ad7d8277cdd7832 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 7baf3ab4ddd525d800c057b5cb27e9e72e2e1db1..29d9e4528fc5dcbdff55dec9d4b7ad3de452b76c 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 9aa920de1bd6da13fb95bdf9e4e406ee55aa37f1..6205d80e057b06a414635d91b55f2d50cfc3aec0 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -337,12 +337,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: