Fix no-ocsp

[openssl.git] / Configurations / windows-makefile.tmpl

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index cdc4436f5c8ba73e6c71ee476a8e2ac47446c79a..b4672ab791cafb50a8b4a43e0f40383e241237d6 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -61,9 +61,11 @@ PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{pr
 TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test\\| } @{$unified_info{programs}}) -}
 SCRIPTS={- join(" ", @{$unified_info{scripts}}) -}
 
+{- output_off() if $disabled{makedepend}; "" -}
 DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
                   grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }
                   keys %{$unified_info{sources}}); -}
+{- output_on() if $disabled{makedepend}; "" -}
 
 # Do not edit these manually. Use Configure with --prefix or --openssldir
 # to change this!  Short explanation in the top comment in Configure
@@ -97,6 +99,8 @@ ENGINESDIR={- use File::Spec::Functions;
 CC={- $target{cc} -}
 CFLAGS={- join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}})) -} {- join(" ", quotify_l("-DENGINESDIR=\"$enginesdir\"", "-DOPENSSLDIR=\"$openssldir\"")) -} {- $target{cflags} -} {- $config{cflags} -}
 COUTFLAG={- $target{coutflag} || "/Fo" -}
+RC={- $target{rc} || "rc" -}
+RCOUTFLAG={- $target{rcoutflag} || "/fo" -}
 LD={- $target{ld} || "link" -}
 LDFLAGS={- $target{lflags} -}
 LDOUTFLAG={- $target{loutflag} || "/out:" -}
@@ -150,7 +154,8 @@ install: install_sw install_ssldirs install_docs
 uninstall: uninstall_docs uninstall_sw
 
 libclean:
-       del /Q /F $(LIBS) $(SHLIBS)
+       $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS)
+       del /Q /F $(LIBS)
        del lib.pdb
 
 clean: libclean
@@ -176,8 +181,8 @@ install_docs:
 uninstall_docs:
 
 install_ssldirs:
-       @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)\certs
-       @$(PERL) $(SRCDIR)\util\mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)\private
+       @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\certs"
+       @$(PERL) $(SRCDIR)\util\mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)\private"
 
 install_dev:
        @if "$(INSTALLTOP)"=="" ( echo INSTALLTOP should not be empty & exit 1 )
@@ -223,7 +228,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
        @echo "***   Please run the same make command again   ***"
        @echo "***                                            ***"
        @echo "**************************************************"
-       @( exit 1 )
+       @exit 1
 
 {-
  use File::Basename;
@@ -243,10 +248,11 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure
       (my $target = $args{src}) =~ s/\.[sS]$/.asm/;
       my $generator = join(" ", @{$args{generator}});
       my $incs = join("", map { " /I ".$_ } @{$args{incs}});
+      my $deps = join(" ", @{$args{deps}});
 
       if ($target !~ /\.asm$/) {
           return <<"EOF";
-$target: $args{generator}->[0]
+$target: $args{generator}->[0] $deps
        \$(PERL) $generator > \$@
 EOF
       } else {
@@ -263,25 +269,25 @@ EOF
               # end up generating foo.s in two steps.
               if ($args{src} =~ /\.S$/) {
                    return <<"EOF";
-$target: $args{generator}->[0]
+$target: $args{generator}->[0] $deps
        set ASM=\$(AS)
        set CC=\$(CC)
        $generator \$@.S
-       \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@
+       \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@
         del /Q \$@.S
 EOF
               }
               # Otherwise....
               return <<"EOF";
-$target: $args{generator}->[0]
+$target: $args{generator}->[0] $deps
        set ASM=\$(AS)
        set CC=\$(CC)
        $generator \$@
 EOF
           }
           return <<"EOF";
-$target: $args{generator}->[0]
-       \$(CC) \$(CFLAGS) $incs /EP /C \$< > \$@
+$target: $args{generator}->[0] $deps
+       \$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \$@.i && move /Y \$@.i \$@
 EOF
       }
   }
@@ -289,7 +295,8 @@ EOF
  sub src2obj {
      my %args = @_;
      my $obj = $args{obj};
-     my @srcs = map { (my $x = $_) =~ s/\.[sS]$/.asm/; $x } ( @{$args{srcs}} );
+     my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x
+                    } ( @{$args{srcs}} );
      my $srcs = join(" ",  @srcs);
      my $deps = join(" ", @srcs, @{$args{deps}});
      my $incs = join("", map { " /I ".$_ } @{$args{incs}});
@@ -303,7 +310,7 @@ $obj$objext: $deps
        \$(AS) \$(ASFLAGS) \$(ASOUTFLAG)\$\@ $srcs
 EOF
      }
-     return <<"EOF";
+     return <<"EOF"    if (!$disabled{makedepend});
 $obj$depext: $deps
        \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\
            \$(PERL) -n << > $obj$depext
@@ -311,11 +318,15 @@ chomp;
 s/^Note: including file: *//;
 \$\$collect{\$\$_} = 1;
 END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" }
-<<KEEP
+<<
 $obj$objext: $obj$depext
        \$(CC) \$(CFLAGS) $ecflags$incs -c \$(COUTFLAG)\$\@ @<<
 $srcs
-<<KEEP
+<<
+EOF
+    return <<"EOF"     if ($disabled{makedepend});
+$obj$objext: $deps
+       \$(CC) \$(CFLAGS) $ecflags$incs -c \$(COUTFLAG)\$\@ $srcs
 EOF
  }
 
@@ -337,15 +348,20 @@ EOF
      my $mkdef_pl = abs2rel(rel2abs(catfile($config{sourcedir},
                                            "util", "mkdef.pl")),
                            rel2abs($config{builddir}));
+     my $mkrc_pl = abs2rel(rel2abs(catfile($config{sourcedir},
+                                          "util", "mkrc.pl")),
+                          rel2abs($config{builddir}));
      my $target = shlib_import($lib);
      return <<"EOF"
 $target: $deps $ordinalsfile $mkdef_pl
        \$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def
        \$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def
        DEL $shlib.def.tmp
+       \$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc
+       \$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc
        \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
                /implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<<
-$objs$linklibs \$(EX_LIBS)
+$objs $shlib.res$linklibs \$(EX_LIBS)
 <<
        DEL /F apps\\$shlib$shlibext
        DEL /F test\\$shlib$shlibext
@@ -388,7 +404,7 @@ EOF
      return <<"EOF";
 $lib$libext: $deps
        \$(AR) \$(ARFLAGS) \$(AROUTFLAG)$lib$libext @<<
-$objs
+\$\?
 <<
 EOF
  }