From db7f8e57499f52355c462617ee916b52a50d368e Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 9 Jul 2011 21:13:28 +0200
Subject: [PATCH] makefiles: Make MODULE contain the full module name also for
 static libraries.

---
 dlls/Makeimplib.rules.in  | 6 +++---
 dlls/adsiid/Makefile.in   | 2 +-
 dlls/dxerr8/Makefile.in   | 2 +-
 dlls/dxerr9/Makefile.in   | 2 +-
 dlls/dxguid/Makefile.in   | 2 +-
 dlls/strmbase/Makefile.in | 2 +-
 dlls/strmiids/Makefile.in | 2 +-
 dlls/uuid/Makefile.in     | 2 +-
 dlls/winecrt0/Makefile.in | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in
index fa3f984ee1f..0a22784f3ec 100644
--- a/dlls/Makeimplib.rules.in
+++ b/dlls/Makeimplib.rules.in
@@ -12,16 +12,16 @@ MAKEDEPFLAGS = -xo -xcross.o
 
 @MAKE_RULES@
 
-all: $(MODULE:%=lib%.a) @CROSSTEST_DISABLE@ $(MODULE:%=lib%.cross.a)
+all: $(MODULE) @CROSSTEST_DISABLE@ $(MODULE:.a=.cross.a)
 
 # Rules for .a library
 
-$(MODULE:%=lib%.a): $(OBJS) Makefile.in
+$(MODULE): $(OBJS) Makefile.in
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
-$(MODULE:%=lib%.cross.a): $(CROSSOBJS) Makefile.in
+$(MODULE:.a=.cross.a): $(CROSSOBJS) Makefile.in
 	$(RM) $@
 	$(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS)
 	$(CROSSRANLIB) $@
diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in
index ea33ed88658..a5b27d53fa8 100644
--- a/dlls/adsiid/Makefile.in
+++ b/dlls/adsiid/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = adsiid
+MODULE    = libadsiid.a
 
 C_SRCS = \
 	adsiid.c
diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in
index 40688909860..aa46a267403 100644
--- a/dlls/dxerr8/Makefile.in
+++ b/dlls/dxerr8/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = dxerr8
+MODULE    = libdxerr8.a
 
 C_SRCS = \
 	dxerr8.c
diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in
index 1555071f4d2..57edb145f29 100644
--- a/dlls/dxerr9/Makefile.in
+++ b/dlls/dxerr9/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = dxerr9
+MODULE    = libdxerr9.a
 
 C_SRCS = \
 	dxerr9.c
diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in
index e2f61c15e84..a47a51f0ad2 100644
--- a/dlls/dxguid/Makefile.in
+++ b/dlls/dxguid/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = dxguid
+MODULE    = libdxguid.a
 
 C_SRCS = \
 	dx10guid.c \
diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in
index 8c19a568b00..5757ddd0fe9 100644
--- a/dlls/strmbase/Makefile.in
+++ b/dlls/strmbase/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = strmbase
+MODULE    = libstrmbase.a
 
 C_SRCS = \
 	dllfunc.c \
diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in
index 362c04021f0..744682e752a 100644
--- a/dlls/strmiids/Makefile.in
+++ b/dlls/strmiids/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = strmiids
+MODULE    = libstrmiids.a
 
 C_SRCS = \
 	strmiids.c
diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in
index 237bb793fa0..bc35e6983ad 100644
--- a/dlls/uuid/Makefile.in
+++ b/dlls/uuid/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = uuid
+MODULE    = libuuid.a
 
 C_SRCS = \
 	uuid.c
diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in
index d85fd3c59a5..23dca02d85d 100644
--- a/dlls/winecrt0/Makefile.in
+++ b/dlls/winecrt0/Makefile.in
@@ -1,4 +1,4 @@
-MODULE    = winecrt0
+MODULE    = libwinecrt0.a
 
 C_SRCS = \
 	delay_load.c \