Configuration: move the handling of zlib_include to config files

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 082ce0798daf44c02c40232c608365daaa14780b..86bc0869b96b2d1bc5ce539b53a4609b9e0f4ba6 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -59,7 +59,7 @@
  sub dependmagic {
      my $target = shift;
 
-     return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+     return "$target: build_generated\n\t\$(MAKE) /\$(MAKEFLAGS) depend && \$(MAKE) /\$(MAKEFLAGS) _$target\n_$target";
  }
  '';
 -}
@@ -175,9 +175,9 @@ LDOUTFLAG={- $target{loutflag} || "/out:" -}$(OSSL_EMPTY)
 EX_LIBS={- join(' ', @{$config{ex_libs}}) -}
 LIB_CPPFLAGS={- join(" ",
                      $target{shared_cppflag} || "",
-                     (map { quotiry_l("-D".$_) }
-                      'OPENSSLDIR="$(OPENSSLDIR)"',
-                      'ENGINESDIR="$(ENGINESDIR)"')) -}
+                     (map { quotify_l("-D".$_) }
+                      "OPENSSLDIR=\"$openssldir\"",
+                      "ENGINESDIR=\"$enginesdir\"")) -}
 LIB_CFLAGS={- join(" ", $target{lib_cflags}, $target{shared_cflag}) -}
 LIB_LDFLAGS={- join(' ', $target{shared_ldflag}, $config{shared_ldflag}) -}
 DSO_CPPFLAGS={- $target{dso_cppflags} || "" -}
@@ -370,8 +370,7 @@ uninstall_html_docs:
 
 configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
        @echo "Detected changed: $?"
-       @echo "Reconfiguring..."
-       "$(PERL)" "$(SRCDIR)\Configure" reconf
+       "$(PERL)" configdata.pm -r -v
        @echo "**************************************************"
        @echo "***                                            ***"
        @echo "***   Please run the same make command again   ***"
@@ -379,6 +378,9 @@ configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{b
        @echo "**************************************************"
        @exit 1
 
+reconfigure reconf:
+       "$(PERL)" configdata.pm -r -v
+
 {-
  use File::Basename;
  use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
@@ -464,11 +466,6 @@ EOF
      my $srcs = '"'.join('" "',  @srcs).'"';
      my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"';
      my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}});
-     unless ($disabled{zlib}) {
-         if ($withargs{zlib_include}) {
-             $incs .= ' /I "'.$withargs{zlib_include}.'"';
-         }
-     }
      my $cflags = '$(CFLAGS)';
      $cflags .= { lib => ' $(LIB_CFLAGS)',
                  dso => ' $(DSO_CFLAGS)',