Alexandre Julliard : dlls:
Remove the no longer needed symlinks to the static libraries.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 16 14:40:55 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 7fb2ae6ec6f844c94d8105352fea937866aeda04
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb2ae6ec6f844c94d8105352fea937866aeda04
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Mar 16 17:25:06 2006 +0100
dlls: Remove the no longer needed symlinks to the static libraries.
---
dlls/Makefile.in | 38 +++++++-------------------------------
dlls/make_dlls | 13 ++++---------
2 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b90abb7..7995d67 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -316,12 +316,6 @@ SYMLINKS_SO = \
itss.dll.so \
joystick.drv.so \
kernel32.dll.so \
- libdxerr8.a \
- libdxerr9.a \
- libdxguid.a \
- libstrmiids.a \
- libuuid.a \
- libwinecrt0.a \
lz32.dll.so \
mapi32.dll.so \
mciavi32.dll.so \
@@ -1046,24 +1040,6 @@ wsock32.dll.so: wsock32/wsock32.dll.so
wtsapi32.dll.so: wtsapi32/wtsapi32.dll.so
$(RM) $@ && $(LN_S) wtsapi32/wtsapi32.dll.so $@
-libdxerr8.a: dxerr8/libdxerr8.a
- $(RM) $@ && $(LN_S) dxerr8/libdxerr8.a $@
-
-libdxerr9.a: dxerr9/libdxerr9.a
- $(RM) $@ && $(LN_S) dxerr9/libdxerr9.a $@
-
-libdxguid.a: dxguid/libdxguid.a
- $(RM) $@ && $(LN_S) dxguid/libdxguid.a $@
-
-libstrmiids.a: strmiids/libstrmiids.a
- $(RM) $@ && $(LN_S) strmiids/libstrmiids.a $@
-
-libuuid.a: uuid/libuuid.a
- $(RM) $@ && $(LN_S) uuid/libuuid.a $@
-
-libwinecrt0.a: winecrt0/libwinecrt0.a
- $(RM) $@ && $(LN_S) winecrt0/libwinecrt0.a $@
-
# Import libraries
@@ -1074,16 +1050,16 @@ IMPORT_SYMLINKS = \
libgdi32.$(IMPLIBEXT) \
libkernel32.$(IMPLIBEXT) \
libmsacm32.$(IMPLIBEXT) \
- libuser32.$(IMPLIBEXT) \
- libdxerr8.a \
- libdxerr9.a \
- libdxguid.a \
- libstrmiids.a \
- libuuid.a \
- libwinecrt0.a
+ libuser32.$(IMPLIBEXT)
IMPORT_LIBS = \
$(IMPORT_SYMLINKS) \
+ dxerr8/libdxerr8.a \
+ dxerr9/libdxerr9.a \
+ dxguid/libdxguid.a \
+ strmiids/libstrmiids.a \
+ uuid/libuuid.a \
+ winecrt0/libwinecrt0.a \
activeds/libactiveds.$(IMPLIBEXT) \
advapi32/libadvapi32.$(IMPLIBEXT) \
advpack/libadvpack.$(IMPLIBEXT) \
diff --git a/dlls/make_dlls b/dlls/make_dlls
index 0a9012b..ccc98d2 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -66,6 +66,7 @@ foreach my $i (split(/\s/,$makefiles))
if ($module =~ /^lib.*\.a$/)
{
($staticlib_dirs{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/;
+ die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module;
}
else
{
@@ -173,7 +174,6 @@ foreach my $mod (sort keys %directories)
$targets16{$i . "16"} = $mod;
}
}
-foreach my $mod (sort keys %staticlib_dirs) { $targets{$mod} = 1; }
print NEWMAKE <<EOF;
@@ -236,11 +236,6 @@ foreach my $mod (sort keys %directories)
printf NEWMAKE "\techo \"%s\" >\$\@\n\n", $mod;
}
}
-foreach my $mod (sort keys %staticlib_dirs)
-{
- printf NEWMAKE "%s: %s/%s\n", $mod, $staticlib_dirs{$mod}, $mod;
- printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\n\n", $staticlib_dirs{$mod}, $mod;
-}
################################################################
# output the import libraries rules
@@ -260,12 +255,12 @@ foreach my $mod (sort @lib_symlinks)
{
printf NEWMAKE " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod};
}
+
+print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
foreach my $mod (sort keys %staticlib_dirs)
{
- printf NEWMAKE " \\\n\t%s", $mod;
+ printf NEWMAKE " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod;
}
-
-print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
foreach my $mod (sort keys %importlibs)
{
my $dir = $directories{$mod};
More information about the wine-cvs
mailing list