Templatize util/domd

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/.gitignore b/.gitignore
index e8d5105d3c5ed12526d4ad2420640523874e0e9d..4bbd89b4d7e194b3f77c596594b5b989f35da253 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@
 /crypto/buildinf.h
 /openssl/include/opensslconf.h
 /crypto/include/internal/*_conf.h
+util/domd
 
 # Auto generated assembly language source files
 *.s

diff --git a/Configure b/Configure
index dd3d88655fea81399c7503115b4de7be56c587d0..d91ed57f4492c922d7052b6d51e6907e7b7a0928 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1292,6 +1292,9 @@ print "RC2 uses $config{rc2_int}\n" if $config{rc2_int} != $def_int;
 
 run_dofile("$Makefile.in","$Makefile");
 
+run_dofile("util/domd.in", "util/domd");
+chmod 0755, "util/domd";
+
 run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
 
 foreach my $alg ( 'bn' ) {
@@ -1664,8 +1667,9 @@ sub run_dofile()
     my $in = shift;
     my $out = shift;
 
+    unlink $out || warn "Can't remove $out, $!"
+        if -f $out;
     die "Can't open $in, $!" unless -f $in;
-    # should we remove $out ?
     system("$config{perl} -I. -Mconfigdata util/dofile.pl -o\"Configure\" $in > $out.new");
     exit 1 if $? != 0;
     rename("$out.new", $out) || die "Can't rename $out.new, $!";

diff --git a/Makefile.in b/Makefile.in
index 4abda2249ca5ede2c162c847800530cede363ccd..09f5db309dbbec458c00eb206a5f823660ff435b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,6 @@ PERL= {- $config{perl} -}
 RM= rm -f
 TAR= tar
 TARFLAGS= --no-recursion
-MAKEDEPPROG=$(CROSS_COMPILE){- $config{makedepprog} -}
 LIBDIR={- $config{libdir} -}
 
 # We let the C compiler driver to take care of .s files. This is done in
@@ -209,9 +208,7 @@ BUILDENV=   LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
                INSTALL_PREFIX='$(INSTALL_PREFIX)'              \
                INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'   \
                LIBDIR='$(LIBDIR)'                              \
-               MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
                DEPFLAG='$(DEPFLAG)'                            \
-               MAKEDEPPROG='$(MAKEDEPPROG)'                    \
                SHARED_LDFLAGS='$(SHARED_LDFLAGS)'              \
                ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'     \
                EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'       \

diff --git a/apps/Makefile.in b/apps/Makefile.in
index 6be42c1e638c43db07b016ae1e9cf02c77dc9848..02585a7d2bd713fb16b1c35268c42cd898b75f39 100644 (file)
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -111,7 +111,7 @@ uninstall:
 generate: openssl-vms.cnf
 
 depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC)
 
 clean:
        rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

diff --git a/crypto/Makefile.in b/crypto/Makefile.in
index 56a83e1746034487544248e5bde58fe9b650fac2..331bbd89543233832302b0f1e2164b2ffdf95a8d 100644 (file)
--- a/crypto/Makefile.in
+++ b/crypto/Makefile.in
@@ -9,8 +9,6 @@ INCLUDE=        -I. -I$(TOP) -I../include -Iinclude $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
 INCLUDES=      -I.. -I../.. -I../modes -I../include -I../../include $(ZLIB_INCLUDE)
 CFLAG=         -g
-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 MAKEFILE=       Makefile
 RM=             rm -f
 AR=            ar r
@@ -109,7 +107,7 @@ libs:
 
 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)" ] || $(TOP)/util/domd $(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

diff --git a/crypto/aes/Makefile.in b/crypto/aes/Makefile.in
index ba397bb7f8fd3d408568c3e45f703f063fcb9aaa..e87e80bee8827ca30248c53718840854ef34fa96 100644 (file)
--- a/crypto/aes/Makefile.in
+++ b/crypto/aes/Makefile.in
@@ -101,8 +101,7 @@ files:
        $(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/asn1/Makefile.in b/crypto/asn1/Makefile.in
index b00f30868fc6d834a0bfbc995b1e7738894a7e7e..c96e1fbef9db725c0560eb29050c976a5c2d280a 100644 (file)
--- a/crypto/asn1/Makefile.in
+++ b/crypto/asn1/Makefile.in
@@ -72,8 +72,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/async/Makefile.in b/crypto/async/Makefile.in
index 34a9136ea3f9f6cbc4eb0e45680a59841861bdfe..c50b04d73bb4cedfa15588f0fa4393b05e7272dc 100644 (file)
--- a/crypto/async/Makefile.in
+++ b/crypto/async/Makefile.in
@@ -53,8 +53,7 @@ install:
        done;
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/bf/Makefile.in b/crypto/bf/Makefile.in
index dd7609de75e11a9605faa7cd38eb8aad63961505..408be9f80858304ac71a552ded9497bb7fa72429 100644 (file)
--- a/crypto/bf/Makefile.in
+++ b/crypto/bf/Makefile.in
@@ -46,8 +46,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/bio/Makefile.in b/crypto/bio/Makefile.in
index 263af7c4e94ebb31ac56ee500936c1157ef3cc59..e4ba2552ea9a04e9338f3a7d8fd669cfc83d62b5 100644 (file)
--- a/crypto/bio/Makefile.in
+++ b/crypto/bio/Makefile.in
@@ -50,8 +50,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index 964f8ecc61f177c41c193e252680274274ae632f..ebae393a7c3a7227600e72bf23332446ccc7ae76 100644 (file)
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -153,8 +153,7 @@ div:
 generate: bn_prime.h
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/buffer/Makefile.in b/crypto/buffer/Makefile.in
index 53493b7a2af61b04bc9ae8c0cfd35073a3038db1..595e1d8d0b2e55f947d4f93b8ea4a179280e3b03 100644 (file)
--- a/crypto/buffer/Makefile.in
+++ b/crypto/buffer/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in
index f26b5418dbec70ac868a3a8b42ac2d20c7043b1a..787b1c675c2ade54d72199d1c6564c7a38215568 100644 (file)
--- a/crypto/camellia/Makefile.in
+++ b/crypto/camellia/Makefile.in
@@ -52,8 +52,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/cast/Makefile.in b/crypto/cast/Makefile.in
index 6d6b6aa9ba9c502a231bc43be21baafc748e1050..6cf4c5c8a02cebe5e68778bf66fd8f3e9b458094 100644 (file)
--- a/crypto/cast/Makefile.in
+++ b/crypto/cast/Makefile.in
@@ -46,8 +46,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/chacha/Makefile.in b/crypto/chacha/Makefile.in
index 6ea517d41e701f0675e3f5c51d3c0baf54a32a97..0590708262f3c31d241519eebc5ca8f121dd7841 100644 (file)
--- a/crypto/chacha/Makefile.in
+++ b/crypto/chacha/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/cmac/Makefile.in b/crypto/cmac/Makefile.in
index 92e145ebe8d8a490466ddbbf847b2cee2f17287b..45c4b977a1cc6bcda05c8c833fb4897e81ca42f0 100644 (file)
--- a/crypto/cmac/Makefile.in
+++ b/crypto/cmac/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/cms/Makefile.in b/crypto/cms/Makefile.in
index 4726b01b80f48c4c147470e989621df8625ebe3a..e68438cd184182f35c66898c4945d87581de7f80 100644 (file)
--- a/crypto/cms/Makefile.in
+++ b/crypto/cms/Makefile.in
@@ -44,8 +44,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/comp/Makefile.in b/crypto/comp/Makefile.in
index a724b082a43e3a230e9df19bddc86324b480ab49..0fdf773336ca808b56291ff38e6e23dea3a136a5 100644 (file)
--- a/crypto/comp/Makefile.in
+++ b/crypto/comp/Makefile.in
@@ -41,8 +41,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/conf/Makefile.in b/crypto/conf/Makefile.in
index 87f39d9532e386c919443a08f8a65b9728c53bc7..501d9e9390e5304de9c46a0c736a6049432e0b2f 100644 (file)
--- a/crypto/conf/Makefile.in
+++ b/crypto/conf/Makefile.in
@@ -41,8 +41,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/ct/Makefile.in b/crypto/ct/Makefile.in
index 71ea255b6230acdb7656482f740640ba3d880591..f5e51e2818d26ffaa0371e3fa8379fc481e4a789 100644 (file)
--- a/crypto/ct/Makefile.in
+++ b/crypto/ct/Makefile.in
@@ -43,8 +43,7 @@ errors:
        $(PERL) $(TOP)/util/mkerr.pl -conf ct.ec -hprefix internal/ -write *.c
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/des/Makefile.in b/crypto/des/Makefile.in
index b06a2646fa7e6b12d901db527e34b2b73dbf609c..c2403f52f18fa11a1aca8e1747828ce335166530 100644 (file)
--- a/crypto/des/Makefile.in
+++ b/crypto/des/Makefile.in
@@ -67,8 +67,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/dh/Makefile.in b/crypto/dh/Makefile.in
index 48df452d9a8621d5bfc23d2b60287309b206af97..308b2a8d06531888e0a698454d8cc3dc71a9f348 100644 (file)
--- a/crypto/dh/Makefile.in
+++ b/crypto/dh/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/dsa/Makefile.in b/crypto/dsa/Makefile.in
index ad25459324bf2eb6c0961973789abe9c867e8b25..de2468df0841446bf89d1da20e0ddac666ed420f 100644 (file)
--- a/crypto/dsa/Makefile.in
+++ b/crypto/dsa/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/dso/Makefile.in b/crypto/dso/Makefile.in
index caa96210b211759cec0be6d97a9788d388f800ea..e6e4de79b6a5c10687ee3896d2f4db23338392fe 100644 (file)
--- a/crypto/dso/Makefile.in
+++ b/crypto/dso/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/ec/Makefile.in b/crypto/ec/Makefile.in
index 7efaf74d3fee0012294c99d68b421b092d6870b3..c241b13cbfeb8b1ad39d80e823d87071271e2f33 100644 (file)
--- a/crypto/ec/Makefile.in
+++ b/crypto/ec/Makefile.in
@@ -67,8 +67,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/engine/Makefile.in b/crypto/engine/Makefile.in
index 18cda3440c57f36621e879458553ac441fab5667..c93021f595da63cb99f8f2bbbe674987b3206c4d 100644 (file)
--- a/crypto/engine/Makefile.in
+++ b/crypto/engine/Makefile.in
@@ -48,8 +48,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/err/Makefile.in b/crypto/err/Makefile.in
index 8a60c663fa84245cee193a4164e1aee605f43b88..93ce3eaf7ec7cefce4dd9bb41d9d391541c43124 100644 (file)
--- a/crypto/err/Makefile.in
+++ b/crypto/err/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/evp/Makefile.in b/crypto/evp/Makefile.in
index 328275434e9d13057ba141c41ad8be94094eb381..8771a207cb8f36d369493b639391da79621de933 100644 (file)
--- a/crypto/evp/Makefile.in
+++ b/crypto/evp/Makefile.in
@@ -63,8 +63,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/hmac/Makefile.in b/crypto/hmac/Makefile.in
index 22d0634432dff6c1c91a54189a68fbc1766f09e9..fbff69e753ea0861388e0f6c4787f92b53a0e3b5 100644 (file)
--- a/crypto/hmac/Makefile.in
+++ b/crypto/hmac/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/idea/Makefile.in b/crypto/idea/Makefile.in
index 695119cd644eef08c481a07885e007c4f87454dd..9a3169ba434c8f201a2e90d1556f5407953717c8 100644 (file)
--- a/crypto/idea/Makefile.in
+++ b/crypto/idea/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/jpake/Makefile.in b/crypto/jpake/Makefile.in
index 2780a1226dd0244f1b5f55ac0eb407378371d982..9a75fae7cab47e7dd27d368f24ad7ee14fe75bf2 100644 (file)
--- a/crypto/jpake/Makefile.in
+++ b/crypto/jpake/Makefile.in
@@ -28,8 +28,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/kdf/Makefile.in b/crypto/kdf/Makefile.in
index 25798afeecd5c836314723406bf25a7b6913eb40..337f3a7a5a2fbd9183f1d7bf5dd1e3233c5dfca1 100644 (file)
--- a/crypto/kdf/Makefile.in
+++ b/crypto/kdf/Makefile.in
@@ -48,8 +48,7 @@ lint:
 update: depend
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/lhash/Makefile.in b/crypto/lhash/Makefile.in
index c8a7fba9a3f0153f2c84a4a63d5bbb9131e7f829..d01faaa2bc3933ce3a571634740c706326842c6c 100644 (file)
--- a/crypto/lhash/Makefile.in
+++ b/crypto/lhash/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/md2/Makefile.in b/crypto/md2/Makefile.in
index 2d38fdd3754e72cba0d07804437db610cbb98586..3a16c014612fb2483ff0200b56df84ee0c1a6d1c 100644 (file)
--- a/crypto/md2/Makefile.in
+++ b/crypto/md2/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/md4/Makefile.in b/crypto/md4/Makefile.in
index 450b149bfcf1e690491875763f767548f2bfb7e6..aa4b647a327b6559e5216da6b64eba80bc582103 100644 (file)
--- a/crypto/md4/Makefile.in
+++ b/crypto/md4/Makefile.in
@@ -39,8 +39,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/md5/Makefile.in b/crypto/md5/Makefile.in
index 8d334ce9f6facab916e15ec16ac6f317187f1ac9..c59718862a2be6e7dc9e3253208b737efd879bf5 100644 (file)
--- a/crypto/md5/Makefile.in
+++ b/crypto/md5/Makefile.in
@@ -56,8 +56,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/mdc2/Makefile.in b/crypto/mdc2/Makefile.in
index 2795760517fcca5685bac308d0619421cd8e58ce..de42139e2dffe5a19fbb5f43b3e0082ab9b0d021 100644 (file)
--- a/crypto/mdc2/Makefile.in
+++ b/crypto/mdc2/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/modes/Makefile.in b/crypto/modes/Makefile.in
index 4f6a945cab10ad3115cb8c85a482599a49efd7cb..1391d72e8efd6cfd0bc7e710d9b4631af93ac6d5 100644 (file)
--- a/crypto/modes/Makefile.in
+++ b/crypto/modes/Makefile.in
@@ -71,8 +71,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/objects/Makefile.in b/crypto/objects/Makefile.in
index 826d5710074c8074761ce2eafea9ace0f1c27d4f..a73383628bfdeaa90c4a94167041954a06916472 100644 (file)
--- a/crypto/objects/Makefile.in
+++ b/crypto/objects/Makefile.in
@@ -53,8 +53,7 @@ files:
 generate: obj_dat.h ../../include/openssl/obj_mac.h obj_xref.h
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index a3d94a5f577ad5814e31dccdd069df1f64e46c7a..6907bc36835e81b0b969996af7d524b03e129c3b 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -5647,3 +5647,4 @@ static const unsigned int obj_objs[NUM_OBJ]={
 956,   /* OBJ_jurisdictionStateOrProvinceName 1 3 6 1 4 1 311 60 2 1 2 */
 957,   /* OBJ_jurisdictionCountryName      1 3 6 1 4 1 311 60 2 1 3 */
 };
+

diff --git a/crypto/ocsp/Makefile.in b/crypto/ocsp/Makefile.in
index 4b301ab1063345d6ac0f3ac538fb45fc858e6e82..ae5f60521aa25091cc3d5737cc11f4466e73b22f 100644 (file)
--- a/crypto/ocsp/Makefile.in
+++ b/crypto/ocsp/Makefile.in
@@ -41,8 +41,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/pem/Makefile.in b/crypto/pem/Makefile.in
index 117ff181fc7e2ba2290634a94714b66673841bdf..d30c0dddfc53a91a60b425b15fc74f54a915f97e 100644 (file)
--- a/crypto/pem/Makefile.in
+++ b/crypto/pem/Makefile.in
@@ -41,8 +41,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/pkcs12/Makefile.in b/crypto/pkcs12/Makefile.in
index e116cc186b724c6a04df2cfa2b92b8e775c22e71..66ef8ca1a4e962758c934f7c201c39ae8a7943e7 100644 (file)
--- a/crypto/pkcs12/Makefile.in
+++ b/crypto/pkcs12/Makefile.in
@@ -44,8 +44,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/pkcs7/Makefile.in b/crypto/pkcs7/Makefile.in
index 7c895785ad9769723c8ed6acb3c11c70f8291d06..c2ee429efb016cb4241aa976dc0237920b6428dc 100644 (file)
--- a/crypto/pkcs7/Makefile.in
+++ b/crypto/pkcs7/Makefile.in
@@ -45,8 +45,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff enc dec sign verify

diff --git a/crypto/poly1305/Makefile.in b/crypto/poly1305/Makefile.in
index 17e14ec5c1cafe297695d1044e872cd14ef8cf57..6498ffcb22d3ab4c0c582a41a5b55d11e09ec544 100644 (file)
--- a/crypto/poly1305/Makefile.in
+++ b/crypto/poly1305/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rand/Makefile.in b/crypto/rand/Makefile.in
index 038632b22677c65ec769c4b04a85cd374893d5c8..e408b6b4e47067b0eb181e8eb0b80321053d164c 100644 (file)
--- a/crypto/rand/Makefile.in
+++ b/crypto/rand/Makefile.in
@@ -40,8 +40,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rc2/Makefile.in b/crypto/rc2/Makefile.in
index 348f714d6f2ddccacd29f0e4d265a8b70df54784..88f20a5e6329a13ba4437f30fa74cc44ae78e488 100644 (file)
--- a/crypto/rc2/Makefile.in
+++ b/crypto/rc2/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rc4/Makefile.in b/crypto/rc4/Makefile.in
index fc820a1256bf42d4d573a542a18bac48ab0a2b7e..df53b27dadea33f117c62b374a0df72b4575344e 100644 (file)
--- a/crypto/rc4/Makefile.in
+++ b/crypto/rc4/Makefile.in
@@ -66,8 +66,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rc5/Makefile.in b/crypto/rc5/Makefile.in
index d215b256010b30020ec7fde5c1b649b06b82c55a..bd8e8b2df3d915569dadede37f5db941420cbd49 100644 (file)
--- a/crypto/rc5/Makefile.in
+++ b/crypto/rc5/Makefile.in
@@ -46,8 +46,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/ripemd/Makefile.in b/crypto/ripemd/Makefile.in
index 158c724eb5717b03fed4e9a3fbfb359e4ea9e9ac..8679016e2af4a58a5e5cc9a16c533c3b05c54737 100644 (file)
--- a/crypto/ripemd/Makefile.in
+++ b/crypto/ripemd/Makefile.in
@@ -46,8 +46,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rsa/Makefile.in b/crypto/rsa/Makefile.in
index 6858a0ab26cf29346e8310d0805ec50e6ed5a3bc..21d579089e160742cc44384237669744dd5eb172 100644 (file)
--- a/crypto/rsa/Makefile.in
+++ b/crypto/rsa/Makefile.in
@@ -44,8 +44,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/seed/Makefile.in b/crypto/seed/Makefile.in
index e572d4b51858826ffa3ed7f3ddf76c74a20ca462..249563970300bfa4634aa5d360ccbe49312d77bd 100644 (file)
--- a/crypto/seed/Makefile.in
+++ b/crypto/seed/Makefile.in
@@ -39,8 +39,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/sha/Makefile.in b/crypto/sha/Makefile.in
index 964be2bac398afe32e12b41e06bbe8db0bbe743f..41b2c8b5f56220eefcbad993ec26371972ecd83c 100644 (file)
--- a/crypto/sha/Makefile.in
+++ b/crypto/sha/Makefile.in
@@ -101,8 +101,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/srp/Makefile.in b/crypto/srp/Makefile.in
index a347a10586673f6fc100c265f51947e493d433a4..3b654da8ddb0cfc66b68706c47a47aef5fb6471e 100644 (file)
--- a/crypto/srp/Makefile.in
+++ b/crypto/srp/Makefile.in
@@ -6,9 +6,6 @@ CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=      Makefile.ssl
 AR=            ar r
 
 CFLAGS= $(INCLUDES) $(CFLAG)
@@ -37,7 +34,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/stack/Makefile.in b/crypto/stack/Makefile.in
index 1e83061f2bbbaf802da00650be4a1265cfc1783e..dc9fec41eebfc063c23533db6befbdd6069d502b 100644 (file)
--- a/crypto/stack/Makefile.in
+++ b/crypto/stack/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/store/Makefile.in b/crypto/store/Makefile.in
index 47f08f89366bde37881e831e6a732b9ff6e3ea40..0347783cc626631d2b6c52d3e4ecd1a5dfc09ece 100644 (file)
--- a/crypto/store/Makefile.in
+++ b/crypto/store/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/ts/Makefile.in b/crypto/ts/Makefile.in
index 8fe12fc84f53723fb663e2fc80dbb20240dd164b..4001e8f3dd0f6313b3b61cdd226f39f3dcef63be 100644 (file)
--- a/crypto/ts/Makefile.in
+++ b/crypto/ts/Makefile.in
@@ -1,5 +1,4 @@
 #
-# SSLeay/crypto/ts/Makefile
 #
 
 DIR=   ts
@@ -10,9 +9,6 @@ CFLAG = -g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=   makedepend
-MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=      Makefile
 AR=            ar r
 
 LDFLAGS=
@@ -52,7 +48,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff enc dec sign verify

diff --git a/crypto/txt_db/Makefile.in b/crypto/txt_db/Makefile.in
index 9241f9b0d2343c1bdda07b4a2d09bf55554b9698..036333c74cc387afb2bfd5aa2c1ea6cd06b4518f 100644 (file)
--- a/crypto/txt_db/Makefile.in
+++ b/crypto/txt_db/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by top Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/ui/Makefile.in b/crypto/ui/Makefile.in
index 71da5a9bd3781f2334b948a99f10b9aa18764a47..ecca10d7728fa9826e487ab5b0cf62a22d0b3c4e 100644 (file)
--- a/crypto/ui/Makefile.in
+++ b/crypto/ui/Makefile.in
@@ -38,8 +38,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/whrlpool/Makefile.in b/crypto/whrlpool/Makefile.in
index e44e153d42a5e1fffdbee5293613a0fb60274cf3..abeae3b27fb6890a635daf4e4a2c36b3f5a7b09f 100644 (file)
--- a/crypto/whrlpool/Makefile.in
+++ b/crypto/whrlpool/Makefile.in
@@ -51,8 +51,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/x509/Makefile.in b/crypto/x509/Makefile.in
index e9cd1ca7369fb0bd419fc2e2fb14c5f945f03d87..c3691f2fa67ebe6f1ecfc107c59606c2c2dc7b97 100644 (file)
--- a/crypto/x509/Makefile.in
+++ b/crypto/x509/Makefile.in
@@ -52,8 +52,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/x509v3/Makefile.in b/crypto/x509v3/Makefile.in
index c35f87cb1e6920dd758a67c2b5a669ba3e01a661..c5edce91ce656e13b205767f3a01874cf0223a72 100644 (file)
--- a/crypto/x509v3/Makefile.in
+++ b/crypto/x509v3/Makefile.in
@@ -48,8 +48,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
-       $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/engines/Makefile.in b/engines/Makefile.in
index d91bd5467f50360a87f7ff8bcea48dade567d57a..a515dc1664f33197bad175011f45d714c0528d20 100644 (file)
--- a/engines/Makefile.in
+++ b/engines/Makefile.in
@@ -116,7 +116,7 @@ errors:
        done
 
 depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC)
+       @[ -z "$(THIS)" ] || $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC)
        @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )
 
 clean:

diff --git a/ssl/Makefile.in b/ssl/Makefile.in
index b3860d3ca463332bbec204d6497c54555dbc623c..586d2879445c02dc2dc6739688f2aa11b7c3089a 100644 (file)
--- a/ssl/Makefile.in
+++ b/ssl/Makefile.in
@@ -72,7 +72,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
 depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
 
 clean:
        rm -f $(LIBOBJ) *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/test/Makefile.in b/test/Makefile.in
index 9dbf54993f46d7808564f18a536c16f01a3d64e5..cf6e8163a009985cf6f23d89cbdb2979e33ed212 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -163,7 +163,7 @@ apps:
        @(cd ..; $(MAKE) DIRS=apps all)
 
 depend:
-       @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
 
 clean:
        rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log *.log dummytest

diff --git a/util/domd b/util/domd
deleted file mode 100755 (executable)
index 9dd7ce5..0000000
--- a/util/domd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Wrapper to portably run makedepend or equivalent compiler built-in.
-# Runs on Makefile.in, generates Makefile
-
-TOP=$1
-shift
-if [ "$1" = "-MD" ]; then
-    shift
-    MAKEDEPEND=$1
-    shift
-    if [ "$MAKEDEPEND" = "ccache" ]; then
-        MAKEDEPEND="$MAKEDEPEND $1"
-        shift
-    fi
-fi
-if [ -z "$MAKEDEPEND" ] ; then
-    MAKEDEPEND=makedepend
-fi
-
-if ${MAKEDEPEND} --version 2>&1 | egrep "clang|gcc" >/dev/null ; then
-    args=""
-    while [ $# -gt 0 ]; do
-        if [ "$1" != '--' ] ; then
-            args="$args $1"
-        fi
-       shift
-    done
-    ${MAKEDEPEND} -Werror -DOPENSSL_DOING_MAKEDEPEND -M $args >Makefile.tmp || exit 1
-    cat Makefile.in Makefile.tmp >Makefile
-    rm Makefile.tmp
-else
-    cp Makefile.in Makefile
-    ${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $@ || exit 1
-fi

diff --git a/util/domd.in b/util/domd.in
new file mode 100755 (executable)
index 0000000..ede2733
--- /dev/null
+++ b/util/domd.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+## Wrapper to portably run makedepend or equivalent compiler built-in.
+## Runs on Makefile.in, generates Makefile
+## {- join("\n## ", @autowarntext) -}
+
+{- "MAKEDEPEND=" . quotify1($config{makedepprog}) -}
+
+case "${MAKEDEPEND}" in
+makedepend)
+    cp Makefile.in Makefile
+    ${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $@ || exit 1
+    ;;
+*)
+    args="-Werror -M"
+    while [ $# -gt 0 ]; do
+        if [ "$1" != '--' ] ; then
+            args="$args $1"
+        fi
+        shift
+    done
+    ${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $args >Makefile.tmp || exit 1
+    cat Makefile.in Makefile.tmp >Makefile
+    rm Makefile.tmp
+    ;;
+esac

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 98e44b05ced75b96b0961fb2e7bc77c1f5376d89..f9eeea8e652df421b2195fa2348cbe05ded83be9 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -50,7 +50,7 @@ my %mf_import = (
        PLATFORM       => \$mf_platform,
        CC             => \$mf_cc,
        CFLAG          => \$mf_cflag,
-       DEPFLAG        => \$mf_depflag,
+        DEPFLAG        => \$mf_depflag,
        CPUID_OBJ      => \$mf_cpuid_asm,
        BN_ASM         => \$mf_bn_asm,
        DES_ENC        => \$mf_des_asm,