Remove all special make depend flags, as well as OPENSSL_DOING_MAKEDEPEND

All those flags existed because we had all the dependencies versioned
in the repository, and wanted to have it be consistent, no matter what
the local configuration was.  Now that the dependencies are gone from
the versioned Makefile.ins, it makes much more sense to use the exact
same flags as when compiling the object files.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7bd611186d846ff1d27e359dd866998ad7cedf9e..4deab325d16ae76b3e7de1c95513af0decff25fb 100644 (file)
--- 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 3bf2e889151e93aa37b52f3c0720efa7ac940f09..41fbf56eab27b5f4e48997752c3ce7354a2e4be5 100755 (executable)
--- 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 cc2c0b520db96a4cac5a34624665a7db2790d0c2..2fa7a652bc3a7192eb19c797e860586fe3e1b959 100644 (file)
--- 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 5fb4f47adf97c9cb1a8c6fa51cb43ee95d0c218c..d49afece363d8f6629de4b32c7908089c55874ff 100644 (file)
--- 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 69556f8720480ac2503d8b1406677d1c5e7c717d..d04f75c3bcc2a6f6379f1f1e6a87f85a7077ef4e 100644 (file)
--- 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 e87e80bee8827ca30248c53718840854ef34fa96..98bfb0a61a8195b33ea5642aac5204a0b4d46cc4 100644 (file)
--- 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 c96e1fbef9db725c0560eb29050c976a5c2d280a..b6c44e7dc7cb9c0fd8897e88eafad35d51dbc407 100644 (file)
--- 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 1a89b997ffb4a9b19f0487ccf2bda05a7adffc25..6e9f4653f69e764b0301d39fb5522b78a4865a74 100644 (file)
--- 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 408be9f80858304ac71a552ded9497bb7fa72429..14e2fe22299c091423df30853cd50bdc0cd68cc8 100644 (file)
--- 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 4ad411e78ff6a165928fae7ad28e1c89a569b5cd..ff35cfb21403a2ec50e2834595daceb387f3dc36 100644 (file)
--- 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 9d454465e4b18561693564854cb2792770695f29..7574585cb7586a02f41e3d629d0d07d62c6ca10f 100644 (file)
--- 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 595e1d8d0b2e55f947d4f93b8ea4a179280e3b03..79eeac15400655d08e61f1645958c3006ea7e413 100644 (file)
--- 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 787b1c675c2ade54d72199d1c6564c7a38215568..ac3ffdaa17e59e49a61de1ce132c1ab4ebe32daa 100644 (file)
--- 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 6cf4c5c8a02cebe5e68778bf66fd8f3e9b458094..cd62408f35694ff09d3f5e52932a9f2346a7fb98 100644 (file)
--- 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 08bfdb5b1d109ef24a4fcf334d0e338ed68d823c..de80ba4fd0ddfe7a06a8a001cdd5ac23dbab2177 100644 (file)
--- 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 45c4b977a1cc6bcda05c8c833fb4897e81ca42f0..44888657c8b24627a2fa1e79c229609211c94e26 100644 (file)
--- 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 e68438cd184182f35c66898c4945d87581de7f80..5e5db74cccb0973a9aaabb617ad7899f2bb97ff5 100644 (file)
--- 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 0fdf773336ca808b56291ff38e6e23dea3a136a5..6db134982bfa16aebebb17ce195871ba8f0d85fc 100644 (file)
--- 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 501d9e9390e5304de9c46a0c736a6049432e0b2f..c0c8cd8982a349aa9bc921efdc13179bf906028f 100644 (file)
--- 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 f5e51e2818d26ffaa0371e3fa8379fc481e4a789..5d186b8fd96418377dd9e389a873c77de3aef42e 100644 (file)
--- 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 c2403f52f18fa11a1aca8e1747828ce335166530..c65c05b1105ff65bdf3796cbc8566ed9b1a662a4 100644 (file)
--- 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 308b2a8d06531888e0a698454d8cc3dc71a9f348..473ad3576a08a5080ccd0b0c001cf18f22ef471e 100644 (file)
--- 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 de2468df0841446bf89d1da20e0ddac666ed420f..dd5bdbef2569e808c5c1f45d33a2086e8d964a20 100644 (file)
--- 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 e6e4de79b6a5c10687ee3896d2f4db23338392fe..1f74735fd5d09f0151afd538d3d0d1ef77a985d7 100644 (file)
--- 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 c241b13cbfeb8b1ad39d80e823d87071271e2f33..eb68dcd4b77d72c3f00d8abcba425eb3fed720a5 100644 (file)
--- 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 dfd479453158d37d5555277dcc176716c6a59688..01dad47eaa5f97e84d36080d6e1ff69d1d4dc618 100644 (file)
--- 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 93ce3eaf7ec7cefce4dd9bb41d9d391541c43124..b2ff21806e99128d6ad2d128c3e77053fab1cc51 100644 (file)
--- 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 61e8929b3a8a3f9565043cc0edc7912d624cc147..100de31047484b8038ecc7bd66905c33f7522d8a 100644 (file)
--- 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 fbff69e753ea0861388e0f6c4787f92b53a0e3b5..ffb80b557e3610bc4fadc03a3ea8d4de37e05e6f 100644 (file)
--- 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 9a3169ba434c8f201a2e90d1556f5407953717c8..c0f12e2944cb55ddf3b43fce2e1893a993fc56b3 100644 (file)
--- 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) $(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/kdf/Makefile.in b/crypto/kdf/Makefile.in
index 337f3a7a5a2fbd9183f1d7bf5dd1e3233c5dfca1..f7ddfe07c7a4f60b331373323f188e5241becc37 100644 (file)
--- a/crypto/kdf/Makefile.in
+++ b/crypto/kdf/Makefile.in
@@ -48,7 +48,7 @@ lint:
 update: depend
 
 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/lhash/Makefile.in b/crypto/lhash/Makefile.in
index d01faaa2bc3933ce3a571634740c706326842c6c..a9dc3dfea99f9d07eccce276b2e7b6dbd1d59b00 100644 (file)
--- a/crypto/lhash/Makefile.in
+++ b/crypto/lhash/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/md2/Makefile.in b/crypto/md2/Makefile.in
index 3a16c014612fb2483ff0200b56df84ee0c1a6d1c..29eeb33f0f5e00bc36b6d0270e76b01feade5fa8 100644 (file)
--- a/crypto/md2/Makefile.in
+++ b/crypto/md2/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/md4/Makefile.in b/crypto/md4/Makefile.in
index aa4b647a327b6559e5216da6b64eba80bc582103..ff5a2c15f0f28d9514d6125a0b8d6d8713527c35 100644 (file)
--- a/crypto/md4/Makefile.in
+++ b/crypto/md4/Makefile.in
@@ -39,7 +39,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 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 c59718862a2be6e7dc9e3253208b737efd879bf5..b1d98e15ae685c82e0eee60b0da237ef6c71c471 100644 (file)
--- a/crypto/md5/Makefile.in
+++ b/crypto/md5/Makefile.in
@@ -56,7 +56,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/mdc2/Makefile.in b/crypto/mdc2/Makefile.in
index de42139e2dffe5a19fbb5f43b3e0082ab9b0d021..8930d0277e8a25e81e4046d59b1b8fe65c9747b8 100644 (file)
--- a/crypto/mdc2/Makefile.in
+++ b/crypto/mdc2/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/modes/Makefile.in b/crypto/modes/Makefile.in
index 1391d72e8efd6cfd0bc7e710d9b4631af93ac6d5..4d3c0b090a89250c746ba3971881dbc926a99bd4 100644 (file)
--- a/crypto/modes/Makefile.in
+++ b/crypto/modes/Makefile.in
@@ -71,7 +71,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/objects/Makefile.in b/crypto/objects/Makefile.in
index a73383628bfdeaa90c4a94167041954a06916472..394da3b0edf38f7961a3d376f95fa416a3eb841c 100644 (file)
--- a/crypto/objects/Makefile.in
+++ b/crypto/objects/Makefile.in
@@ -53,7 +53,7 @@ files:
 generate: obj_dat.h ../../include/openssl/obj_mac.h obj_xref.h
 
 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/ocsp/Makefile.in b/crypto/ocsp/Makefile.in
index ae5f60521aa25091cc3d5737cc11f4466e73b22f..26d977412f1f5147b4ff1b9140b6c8a55454fa5c 100644 (file)
--- a/crypto/ocsp/Makefile.in
+++ b/crypto/ocsp/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/pem/Makefile.in b/crypto/pem/Makefile.in
index d30c0dddfc53a91a60b425b15fc74f54a915f97e..8a23ef684c21f9c4b4b28ae139b18bd218f46ead 100644 (file)
--- a/crypto/pem/Makefile.in
+++ b/crypto/pem/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/pkcs12/Makefile.in b/crypto/pkcs12/Makefile.in
index 1b8d80e49a222828ace991797c1eeb699074bc1e..651f13fef463f9333b90f83370c5efc57ab91c1d 100644 (file)
--- a/crypto/pkcs12/Makefile.in
+++ b/crypto/pkcs12/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/pkcs7/Makefile.in b/crypto/pkcs7/Makefile.in
index 973b9823034c744163972dc34881ba7ec85c4a70..a58e323b56d6874f33abb1e537cd23478437e6f8 100644 (file)
--- a/crypto/pkcs7/Makefile.in
+++ b/crypto/pkcs7/Makefile.in
@@ -45,7 +45,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 enc dec sign verify

diff --git a/crypto/poly1305/Makefile.in b/crypto/poly1305/Makefile.in
index d027eedc783bab691fad46e2faa11cfbae7b5e05..8735b79308c31fac59e1b5a1503b84887591ef9a 100644 (file)
--- a/crypto/poly1305/Makefile.in
+++ b/crypto/poly1305/Makefile.in
@@ -56,7 +56,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/rand/Makefile.in b/crypto/rand/Makefile.in
index e408b6b4e47067b0eb181e8eb0b80321053d164c..bf9ff3edff7ccbe0acebe6ffcfefc5f942dc20c0 100644 (file)
--- a/crypto/rand/Makefile.in
+++ b/crypto/rand/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 *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/rc2/Makefile.in b/crypto/rc2/Makefile.in
index 88f20a5e6329a13ba4437f30fa74cc44ae78e488..3eaf4e3fb176721bcbc015ce6b7d0f4e3cd3c631 100644 (file)
--- a/crypto/rc2/Makefile.in
+++ b/crypto/rc2/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/rc4/Makefile.in b/crypto/rc4/Makefile.in
index df53b27dadea33f117c62b374a0df72b4575344e..f0f72d1a57dfdceb6dfd5cbc440500dc415c7f02 100644 (file)
--- a/crypto/rc4/Makefile.in
+++ b/crypto/rc4/Makefile.in
@@ -66,7 +66,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/rc5/Makefile.in b/crypto/rc5/Makefile.in
index bd8e8b2df3d915569dadede37f5db941420cbd49..9efe7f9335fc3d0ff74120b4381dc0baacc20c5e 100644 (file)
--- a/crypto/rc5/Makefile.in
+++ b/crypto/rc5/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/ripemd/Makefile.in b/crypto/ripemd/Makefile.in
index 8679016e2af4a58a5e5cc9a16c533c3b05c54737..3aed997ed1afe7266dd361e1fb6c7722f1633d9e 100644 (file)
--- a/crypto/ripemd/Makefile.in
+++ b/crypto/ripemd/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/rsa/Makefile.in b/crypto/rsa/Makefile.in
index 21d579089e160742cc44384237669744dd5eb172..8779cc7781153775730c9951a0b74e3208d51e6a 100644 (file)
--- a/crypto/rsa/Makefile.in
+++ b/crypto/rsa/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 */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/seed/Makefile.in b/crypto/seed/Makefile.in
index 249563970300bfa4634aa5d360ccbe49312d77bd..a6c85afc562fc37417004207216f8b42aa01cbda 100644 (file)
--- a/crypto/seed/Makefile.in
+++ b/crypto/seed/Makefile.in
@@ -39,7 +39,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/sha/Makefile.in b/crypto/sha/Makefile.in
index 41b2c8b5f56220eefcbad993ec26371972ecd83c..267586971bbcfe2c0d7ea380466280af3fa6a074 100644 (file)
--- a/crypto/sha/Makefile.in
+++ b/crypto/sha/Makefile.in
@@ -101,7 +101,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/srp/Makefile.in b/crypto/srp/Makefile.in
index eded0e772aa2d93171225824d55e3cef3b5f4a2c..8b0c9c7318a4dcac381e32289d60d915030723c9 100644 (file)
--- a/crypto/srp/Makefile.in
+++ b/crypto/srp/Makefile.in
@@ -34,7 +34,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/stack/Makefile.in b/crypto/stack/Makefile.in
index dc9fec41eebfc063c23533db6befbdd6069d502b..22630c2a8ad6ce1adb5f9f85ac15598a73f926f5 100644 (file)
--- a/crypto/stack/Makefile.in
+++ b/crypto/stack/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/ts/Makefile.in b/crypto/ts/Makefile.in
index db034baa9fa0dcc436710fa68768fb09df5bb59f..f5d40b9acf6f647d3d62ced50c6bddbf47f5cd67 100644 (file)
--- a/crypto/ts/Makefile.in
+++ b/crypto/ts/Makefile.in
@@ -48,7 +48,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 enc dec sign verify

diff --git a/crypto/txt_db/Makefile.in b/crypto/txt_db/Makefile.in
index 036333c74cc387afb2bfd5aa2c1ea6cd06b4518f..3229d521c4ff6a5021606648192ee7222cad6726 100644 (file)
--- a/crypto/txt_db/Makefile.in
+++ b/crypto/txt_db/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/ui/Makefile.in b/crypto/ui/Makefile.in
index ecca10d7728fa9826e487ab5b0cf62a22d0b3c4e..c8f327a3c5a7203bc6e872ea981ba9e28d701008 100644 (file)
--- a/crypto/ui/Makefile.in
+++ b/crypto/ui/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 */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/whrlpool/Makefile.in b/crypto/whrlpool/Makefile.in
index abeae3b27fb6890a635daf4e4a2c36b3f5a7b09f..60278834bb74d5e510a29bd0aace82fbc025e0ca 100644 (file)
--- a/crypto/whrlpool/Makefile.in
+++ b/crypto/whrlpool/Makefile.in
@@ -51,7 +51,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/x509/Makefile.in b/crypto/x509/Makefile.in
index c3691f2fa67ebe6f1ecfc107c59606c2c2dc7b97..440ff72858877544d1224a3e65c4f4bd3c9263de 100644 (file)
--- a/crypto/x509/Makefile.in
+++ b/crypto/x509/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 *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/crypto/x509v3/Makefile.in b/crypto/x509v3/Makefile.in
index c5edce91ce656e13b205767f3a01874cf0223a72..6dec02b1f6134922140fa353cd07f74673029bc9 100644 (file)
--- a/crypto/x509v3/Makefile.in
+++ b/crypto/x509v3/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 *.obj lib tags core .pure .nfs* *.old *.bak fluff

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

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index e5f3ccdc435b34280d846f39cdc4bbfa1a88070b..54a13545e272dda54c2543616964605e55bb2f0c 100644 (file)
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -42,14 +42,6 @@ extern "C" {
        $OUT .= "# endif\n";
       }
     }
-    if ($OUT) {
-        $OUT = <<"EOF";
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-$OUT
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-EOF
-    }
     "";
 -}
 

diff --git a/ssl/Makefile.in b/ssl/Makefile.in
index cf507ae3ae4bcd53daeb3cbfebaf120e05b6b2e2..e56ffa0281eb43f6fc2d6db77add42a1c9399e66 100644 (file)
--- a/ssl/Makefile.in
+++ b/ssl/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 $(LIBOBJ) *.obj lib tags core .pure .nfs* *.old *.bak fluff

diff --git a/test/Makefile.in b/test/Makefile.in
index 0a75304a2a0af220d9fed8357315f5586e459a93..767948c60289b5bf6d78261ddce40897999028d1 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -165,7 +165,7 @@ apps:
        @(cd ..; $(MAKE) DIRS=apps all)
 
 depend:
-       $(TOP)/util/domd $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)
+       $(TOP)/util/domd $(CFLAG) $(INCLUDES) -- $(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.in b/util/domd.in
index 20d3474372f09a0b23abb1f00ee7966658f1ede6..1569c35eba2df5ac7b98d297779fc683312aebd0 100755 (executable)
--- a/util/domd.in
+++ b/util/domd.in
@@ -9,7 +9,7 @@ case "${MAKEDEPEND}" in
 cat)
     ;;
 makedepend)
-    ${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $@ || exit 1
+    ${MAKEDEPEND} $@ || exit 1
     ;;
 *)
     args="-Werror -MM"
@@ -20,7 +20,7 @@ makedepend)
         shift
     done
     sed -e '/DO NOT DELETE THIS LINE/q' Makefile >Makefile.tmp
-    ${MAKEDEPEND} -DOPENSSL_DOING_MAKEDEPEND $args >>Makefile.tmp || exit 1
+    ${MAKEDEPEND} $args >>Makefile.tmp || exit 1
     mv Makefile.tmp Makefile
     ;;
 esac