make_makefiles: Fix importlib handling.

This commit is contained in:
Tony Wasserka 2008-03-04 15:08:57 +01:00 committed by Alexandre Julliard
parent 4f148c28a1
commit 9b7ca823d3
1 changed files with 3 additions and 9 deletions

View File

@ -526,12 +526,9 @@ sub update_dlls(@)
}
foreach my $mod (sort keys %importlibs)
{
my $dir = $directories{$mod};
my $def = $mod;
$def =~ s/\.(dll|drv)$//;
$text .= sprintf " \\\n\t%s/lib%s.\$(IMPLIBEXT)", $dir, $def;
$text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(IMPLIBEXT)";
next unless defined $static_implibs{$mod};
$text .= sprintf " \\\n\t%s/lib%s.\$(STATIC_IMPLIBEXT)", $dir, $def
$text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
}
$text .= "\n\n";
$text .= "implib: \$(IMPORT_LIBS)\n\n";
@ -588,10 +585,7 @@ sub update_dlls(@)
}
foreach my $mod (sort keys %importlibs)
{
my $dir = $directories{$mod};
my $def = $mod;
$def =~ s/\.(dll|drv)$//;
push @ignores, "dlls/$dir/lib$def.def";
push @ignores, "dlls/$directories{$mod}/$importlibs{$mod}.def";
}
return @ignores;