Commit 45a795c0 authored by Alexandre Julliard's avatar Alexandre Julliard

Restored the library file intermediate step for symlink dependencies.

parent 59546024
...@@ -167,7 +167,7 @@ printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets ); ...@@ -167,7 +167,7 @@ printf NEWMAKE "\t%s\n", join( " \\\n\t", sort keys %targets );
print NEWMAKE <<EOF; print NEWMAKE <<EOF;
# Map library name to directory # Map symlink name to the corresponding library
EOF EOF
...@@ -183,7 +183,7 @@ foreach my $mod (sort keys %directories) ...@@ -183,7 +183,7 @@ foreach my $mod (sort keys %directories)
printf NEWMAKE " %s\$(DLLEXT)", $i; printf NEWMAKE " %s\$(DLLEXT)", $i;
} }
} }
printf NEWMAKE ": %s\n", $directories{$mod}; printf NEWMAKE ": %s/%s\$(DLLEXT)\n", $directories{$mod}, $mod;
printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n", $directories{$mod}, $mod; printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n", $directories{$mod}, $mod;
} }
...@@ -191,11 +191,19 @@ foreach my $mod (sort keys %directories) ...@@ -191,11 +191,19 @@ foreach my $mod (sort keys %directories)
################################################################ ################################################################
# output the inter-dll dependencies and rules # output the inter-dll dependencies and rules
print NEWMAKE "# Inter-dll dependencies\n\n"; print NEWMAKE "# Map library name to the corresponding directory\n\n";
foreach my $mod (sort keys %directories)
{
printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod};
}
print NEWMAKE "\n# Inter-dll dependencies\n\n";
my @depends = (); my @depends = ();
foreach my $mod (sort keys %imports) foreach my $mod (sort keys %imports)
{ {
next unless @{$imports{$mod}};
my $count = 0; my $count = 0;
my $dep = sprintf("%s:", $directories{$mod}); my $dep = sprintf("%s:", $directories{$mod});
$dep .= " " x (8-length($directories{$mod})); $dep .= " " x (8-length($directories{$mod}));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment