diff options
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 @@ -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) $(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 337f3a7a5a..f7ddfe07c7 100644 --- 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 d01faaa2bc..a9dc3dfea9 100644 --- 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 3a16c01461..29eeb33f0f 100644 --- 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 aa4b647a32..ff5a2c15f0 100644 --- 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 c59718862a..b1d98e15ae 100644 --- 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 de42139e2d..8930d0277e 100644 --- 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 1391d72e8e..4d3c0b090a 100644 --- 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 a73383628b..394da3b0ed 100644 --- 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 ae5f60521a..26d977412f 100644 --- 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 d30c0dddfc..8a23ef684c 100644 --- 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 1b8d80e49a..651f13fef4 100644 --- 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 973b982303..a58e323b56 100644 --- 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 d027eedc78..8735b79308 100644 --- 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 e408b6b4e4..bf9ff3edff 100644 --- 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 88f20a5e63..3eaf4e3fb1 100644 --- 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 df53b27dad..f0f72d1a57 100644 --- 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 bd8e8b2df3..9efe7f9335 100644 --- 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 8679016e2a..3aed997ed1 100644 --- 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 21d579089e..8779cc7781 100644 --- 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 2495639703..a6c85afc56 100644 --- 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 41b2c8b5f5..267586971b 100644 --- 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 eded0e772a..8b0c9c7318 100644 --- 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 dc9fec41ee..22630c2a8a 100644 --- 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 db034baa9f..f5d40b9acf 100644 --- 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 036333c74c..3229d521c4 100644 --- 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 ecca10d772..c8f327a3c5 100644 --- 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 abeae3b27f..60278834bb 100644 --- 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 c3691f2fa6..440ff72858 100644 --- 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 c5edce91ce..6dec02b1f6 100644 --- 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 e4204ee1eb..047b6b470a 100644 --- 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 e5f3ccdc43..54a13545e2 100644 --- 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 cf507ae3ae..e56ffa0281 100644 --- 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 0a75304a2a..767948c602 100644 --- 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 20d3474372..1569c35eba 100755 --- 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 |