Building: Add modules with DEPENDs to GENERATEd files

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 4a83d0cee6aaf788a8288927e100416fbfe1e108..19e3f4e0eee5f2cf024c9a8b278a8162bc9a28fc 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -558,10 +558,14 @@ EOF
               my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
                                                    "util", "dofile.pl")),
                                    rel2abs($config{builddir}));
+              my @modules = ( 'configdata.pm',
+                              grep { $_ =~ m|\.pm$| } @{$args{deps}} );
+              my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules;
+              @modules = map { "-M".basename($_, '.pm') } @modules;
+              my $modules = join(' ', '', sort keys %moduleincs, @modules);
               return <<"EOF";
 $target: "$args{generator}->[0]" $deps
-       "\$(PERL)" "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
-           "-o$target{build_file}" $generator > \$@
+       "\$(PERL)"$modules "$dofile" "-o$target{build_file}" $generator > \$@
 EOF
          } else {
               return <<"EOF";