summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Configurations/unix-Makefile.tmpl7
-rwxr-xr-xConfigure13
-rw-r--r--Makefile.in2
-rw-r--r--apps/Makefile.in2
-rw-r--r--crypto/Makefile.in2
-rw-r--r--crypto/aes/Makefile.in2
-rw-r--r--crypto/asn1/Makefile.in2
-rw-r--r--crypto/async/Makefile.in2
-rw-r--r--crypto/bf/Makefile.in2
-rw-r--r--crypto/bio/Makefile.in2
-rw-r--r--crypto/bn/Makefile.in2
-rw-r--r--crypto/buffer/Makefile.in2
-rw-r--r--crypto/camellia/Makefile.in2
-rw-r--r--crypto/cast/Makefile.in2
-rw-r--r--crypto/chacha/Makefile.in2
-rw-r--r--crypto/cmac/Makefile.in2
-rw-r--r--crypto/cms/Makefile.in2
-rw-r--r--crypto/comp/Makefile.in2
-rw-r--r--crypto/conf/Makefile.in2
-rw-r--r--crypto/ct/Makefile.in2
-rw-r--r--crypto/des/Makefile.in2
-rw-r--r--crypto/dh/Makefile.in2
-rw-r--r--crypto/dsa/Makefile.in2
-rw-r--r--crypto/dso/Makefile.in2
-rw-r--r--crypto/ec/Makefile.in2
-rw-r--r--crypto/engine/Makefile.in2
-rw-r--r--crypto/err/Makefile.in2
-rw-r--r--crypto/evp/Makefile.in2
-rw-r--r--crypto/hmac/Makefile.in2
-rw-r--r--crypto/idea/Makefile.in2
-rw-r--r--crypto/kdf/Makefile.in2
-rw-r--r--crypto/lhash/Makefile.in2
-rw-r--r--crypto/md2/Makefile.in2
-rw-r--r--crypto/md4/Makefile.in2
-rw-r--r--crypto/md5/Makefile.in2
-rw-r--r--crypto/mdc2/Makefile.in2
-rw-r--r--crypto/modes/Makefile.in2
-rw-r--r--crypto/objects/Makefile.in2
-rw-r--r--crypto/ocsp/Makefile.in2
-rw-r--r--crypto/pem/Makefile.in2
-rw-r--r--crypto/pkcs12/Makefile.in2
-rw-r--r--crypto/pkcs7/Makefile.in2
-rw-r--r--crypto/poly1305/Makefile.in2
-rw-r--r--crypto/rand/Makefile.in2
-rw-r--r--crypto/rc2/Makefile.in2
-rw-r--r--crypto/rc4/Makefile.in2
-rw-r--r--crypto/rc5/Makefile.in2
-rw-r--r--crypto/ripemd/Makefile.in2
-rw-r--r--crypto/rsa/Makefile.in2
-rw-r--r--crypto/seed/Makefile.in2
-rw-r--r--crypto/sha/Makefile.in2
-rw-r--r--crypto/srp/Makefile.in2
-rw-r--r--crypto/stack/Makefile.in2
-rw-r--r--crypto/ts/Makefile.in2
-rw-r--r--crypto/txt_db/Makefile.in2
-rw-r--r--crypto/ui/Makefile.in2
-rw-r--r--crypto/whrlpool/Makefile.in2
-rw-r--r--crypto/x509/Makefile.in2
-rw-r--r--crypto/x509v3/Makefile.in2
-rw-r--r--engines/Makefile.in2
-rw-r--r--include/openssl/opensslconf.h.in8
-rw-r--r--ssl/Makefile.in2
-rw-r--r--test/Makefile.in2
-rwxr-xr-xutil/domd.in4
64 files changed, 63 insertions, 89 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7bd611186d..4deab325d1 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -97,7 +97,6 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -}
CC= $(CROSS_COMPILE){- $target{cc} -}
CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}
CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}
-DEPFLAGS= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -}
LDFLAGS= {- $config{lflags} -}
PLIB_LDFLAGS= {- $config{plib_lflags} -}
EX_LIBS= {- $config{ex_libs} -}
@@ -743,9 +742,7 @@ Makefile: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/confi
return <<"EOF";
$obj\$(DEP_EXT): $deps
rm -f \$\@.tmp; touch \$\@.tmp
- \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" \\
- -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \\
- -- $srcs \\
+ \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" -- \$(CFLAGS)$incs -- $srcs \\
2>/dev/null
sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@
rm \$\@.tmp
@@ -755,7 +752,7 @@ EOF
}
return <<"EOF";
$obj\$(DEP_EXT): $deps
- \$(CC) -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs -MM -MF \$\@ -MQ $obj $srcs
+ \$(CC) \$(CFLAGS)$incs -MM -MF \$\@ -MQ $obj $srcs
$obj\$(OBJ_EXT): $obj\$(DEP_EXT)
\$(CC) \$(CFLAGS)$incs -c -o \$\@ $srcs
EOF
diff --git a/Configure b/Configure
index 3bf2e88915..41fbf56eab 100755
--- a/Configure
+++ b/Configure
@@ -400,14 +400,6 @@ while ((my $first, my $second) = (shift @list, shift @list)) {
unshift @list, $second;
}
-# Construct the string of what $config{depdefines} should look like with
-# the defaults from %disabled above. (we need this to see if we should
-# advise the user to run "make depend"):
-my @default_depdefines =
- map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "OPENSSL_NO_$x"; }
- grep { $disabled{$_} !~ /\(no-depdefines\)$/ }
- sort keys %disabled;
-
# Explicit "no-..." options will be collected in %disabled along with the defaults.
# To remove something from %disabled, use "enable-foo".
# For symmetry, "disable-foo" is a synonym for "no-foo".
@@ -429,7 +421,6 @@ my $no_sse2=0;
my $user_cflags="";
my @user_defines=();
my $unified = 0;
-$config{depdefines}=[];
$config{openssl_api_defines}=[];
$config{openssl_algorithm_defines}=[];
$config{openssl_thread_defines}=[];
@@ -785,7 +776,6 @@ foreach (sort (keys %disabled))
($ALGO,$algo) = ("RMD160","rmd160") if ($algo eq "ripemd");
push @{$config{openssl_algorithm_defines}}, "OPENSSL_NO_$ALGO";
- push @{$config{depdefines}}, "OPENSSL_NO_$ALGO";
print " OPENSSL_NO_$ALGO";
# fix-up crypto/directory name(s)
@@ -1097,8 +1087,6 @@ if ($^O ne "VMS") {
close(PIPE);
}
-$config{depflags} =~ s/^\s*//;
-
# Deal with bn_ops ###################################################
@@ -1134,7 +1122,6 @@ $config{cflags} =~ s/([\\\"])/\\\1/g;
if (defined($config{api})) {
$config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ];
my $apiflag = sprintf("OPENSSL_API_COMPAT=%s", $apitable->{$config{api}});
- push @default_depdefines, $apiflag;
push @{$config{defines}}, $apiflag;
}
diff --git a/Makefile.in b/Makefile.in
index cc2c0b520d..2fa7a652bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,7 +92,6 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -}
CC= $(CROSS_COMPILE){- $target{cc} -}
CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}
CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}
-DEPFLAG= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -}
LDFLAG= {- $config{lflags} -}
PLIB_LDFLAG= {- $config{plib_lflags} -}
EX_LIBS= {- $config{ex_libs} -}
@@ -254,7 +253,6 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
DESTDIR='$(DESTDIR)' \
INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \
LIBDIR='$(LIBDIR)' \
- DEPFLAG='$(DEPFLAG)' \
SHARED_LDFLAG='$(SHARED_LDFLAG)' \
SHARED_RCFLAG='$(SHARED_RCFLAG)' \
ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
diff --git a/apps/Makefile.in b/apps/Makefile.in
index 5fb4f47adf..d49afece36 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -111,7 +111,7 @@ uninstall:
generate: openssl-vms.cnf progs.h
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(EXE_SRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 69556f8720..d04f75c3bc 100644
--- a/crypto/Makefile.in
+++ b/crypto/Makefile.in
@@ -107,7 +107,7 @@ libs:
depend:
@[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist
- @[ -z "$(THIS)" ] || $(TOP)/util/domd $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ @[ -z "$(THIS)" ] || $(TOP)/util/domd $(CFLAG) $(INCLUDE) -- $(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 e87e80bee8..98bfb0a61a 100644
--- a/crypto/aes/Makefile.in
+++ b/crypto/aes/Makefile.in
@@ -101,7 +101,7 @@ files:
$(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 c96e1fbef9..b6c44e7dc7 100644
--- a/crypto/asn1/Makefile.in
+++ b/crypto/asn1/Makefile.in
@@ -72,7 +72,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 1a89b997ff..6e9f4653f6 100644
--- a/crypto/async/Makefile.in
+++ b/crypto/async/Makefile.in
@@ -53,7 +53,7 @@ install:
done;
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 408be9f808..14e2fe2229 100644
--- a/crypto/bf/Makefile.in
+++ b/crypto/bf/Makefile.in
@@ -46,7 +46,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 4ad411e78f..ff35cfb214 100644
--- a/crypto/bio/Makefile.in
+++ b/crypto/bio/Makefile.in
@@ -50,7 +50,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 9d454465e4..7574585cb7 100644
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -140,7 +140,7 @@ div:
generate: bn_prime.h
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(PROGS) $(LIBSRC)
clean:
rm -f *.s *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
diff --git a/crypto/buffer/Makefile.in b/crypto/buffer/Makefile.in
index 595e1d8d0b..79eeac1540 100644
--- a/crypto/buffer/Makefile.in
+++ b/crypto/buffer/Makefile.in
@@ -38,7 +38,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 787b1c675c..ac3ffdaa17 100644
--- a/crypto/camellia/Makefile.in
+++ b/crypto/camellia/Makefile.in
@@ -52,7 +52,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 6cf4c5c8a0..cd62408f35 100644
--- a/crypto/cast/Makefile.in
+++ b/crypto/cast/Makefile.in
@@ -46,7 +46,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 08bfdb5b1d..de80ba4fd0 100644
--- a/crypto/chacha/Makefile.in
+++ b/crypto/chacha/Makefile.in
@@ -52,7 +52,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 45c4b977a1..44888657c8 100644
--- a/crypto/cmac/Makefile.in
+++ b/crypto/cmac/Makefile.in
@@ -38,7 +38,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 e68438cd18..5e5db74ccc 100644
--- a/crypto/cms/Makefile.in
+++ b/crypto/cms/Makefile.in
@@ -44,7 +44,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 0fdf773336..6db134982b 100644
--- a/crypto/comp/Makefile.in
+++ b/crypto/comp/Makefile.in
@@ -41,7 +41,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 501d9e9390..c0c8cd8982 100644
--- a/crypto/conf/Makefile.in
+++ b/crypto/conf/Makefile.in
@@ -41,7 +41,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 f5e51e2818..5d186b8fd9 100644
--- a/crypto/ct/Makefile.in
+++ b/crypto/ct/Makefile.in
@@ -43,7 +43,7 @@ errors:
$(PERL) $(TOP)/util/mkerr.pl -conf ct.ec -hprefix internal/ -write *.c
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 c2403f52f1..c65c05b110 100644
--- a/crypto/des/Makefile.in
+++ b/crypto/des/Makefile.in
@@ -67,7 +67,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 308b2a8d06..473ad3576a 100644
--- a/crypto/dh/Makefile.in
+++ b/crypto/dh/Makefile.in
@@ -40,7 +40,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 de2468df08..dd5bdbef25 100644
--- a/crypto/dsa/Makefile.in
+++ b/crypto/dsa/Makefile.in
@@ -40,7 +40,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 e6e4de79b6..1f74735fd5 100644
--- a/crypto/dso/Makefile.in
+++ b/crypto/dso/Makefile.in
@@ -40,7 +40,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 c241b13cbf..eb68dcd4b7 100644
--- a/crypto/ec/Makefile.in
+++ b/crypto/ec/Makefile.in
@@ -67,7 +67,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 dfd4794531..01dad47eaa 100644
--- a/crypto/engine/Makefile.in
+++ b/crypto/engine/Makefile.in
@@ -48,7 +48,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 93ce3eaf7e..b2ff21806e 100644
--- a/crypto/err/Makefile.in
+++ b/crypto/err/Makefile.in
@@ -38,7 +38,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 61e8929b3a..100de31047 100644
--- a/crypto/evp/Makefile.in
+++ b/crypto/evp/Makefile.in
@@ -63,7 +63,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 fbff69e753..ffb80b557e 100644
--- a/crypto/hmac/Makefile.in
+++ b/crypto/hmac/Makefile.in
@@ -38,7 +38,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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 9a3169ba43..c0f12e2944 100644
--- a/crypto/idea/Makefile.in
+++ b/crypto/idea/Makefile.in
@@ -38,7 +38,7 @@ files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
depend:
- $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $