diff options
68 files changed, 94 insertions, 163 deletions
diff --git a/.gitignore b/.gitignore index e8d5105d3c..4bbd89b4d7 100644 --- 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 @@ -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 4abda2249c..09f5db309d 100644 --- 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 6be42c1e63..02585a7d2b 100644 --- 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 56a83e1746..331bbd8954 100644 --- 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 ba397bb7f8..e87e80bee8 100644 --- 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 b00f30868f..c96e1fbef9 100644 --- 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 34a9136ea3..c50b04d73b 100644 --- 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 dd7609de75..408be9f808 100644 --- 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 263af7c4e9..e4ba2552ea 100644 --- 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 964f8ecc61..ebae393a7c 100644 --- 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 53493b7a2a..595e1d8d0b 100644 --- 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 f26b5418db..787b1c675c 100644 --- 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 6d6b6aa9ba..6cf4c5c8a0 100644 --- 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 6ea517d41e..0590708262 100644 --- 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 92e145ebe8..45c4b977a1 100644 --- 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 4726b01b80..e68438cd18 100644 --- 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 a724b082a4..0fdf773336 100644 --- 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 87f39d9532..501d9e9390 100644 --- 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 71ea255b62..f5e51e2818 100644 --- 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 b06a2646fa..c2403f52f1 100644 --- 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 48df452d9a..308b2a8d06 100644 --- 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 ad25459324..de2468df08 100644 --- 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 caa96210b2..e6e4de79b6 100644 --- 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 7efaf74d3f..c241b13cbf 100644 --- 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 18cda3440c..c93021f595 100644 --- 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 8a60c663fa..93ce3eaf7e 100644 --- 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 328275434e..8771a207cb 100644 --- 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 22d0634432..fbff69e753 100644 --- 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) $(I |