From 7fb2ae6ec6f844c94d8105352fea937866aeda04 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 16 Mar 2006 17:25:06 +0100
Subject: [PATCH] dlls: Remove the no longer needed symlinks to the static
 libraries.

---
 dlls/Makefile.in | 38 +++++++-------------------------------
 dlls/make_dlls   | 15 +++++----------
 2 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b90abb743c9..7995d67a64a 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 0a9012b7dd3..ccc98d2fe20 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};
 }
-foreach my $mod (sort keys %staticlib_dirs)
-{
-    printf NEWMAKE " \\\n\t%s", $mod;
-}
 
 print NEWMAKE "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
+foreach my $mod (sort keys %staticlib_dirs)
+{
+    printf NEWMAKE " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod;
+}
 foreach my $mod (sort keys %importlibs)
 {
     my $dir = $directories{$mod};