Alexandre Julliard : makefiles: Support non-standard import lib names in the global dll rules.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 41f36c49e0193e77c736b564aa7d32023e7c063f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=41f36c49e0193e77c736b564aa...

Author: Alexandre Julliard 
Date:   Thu Mar  6 11:54:03 2008 +0100

makefiles: Support non-standard import lib names in the global dll rules.

---

dlls/Makedll.rules.in         |   10 +++++-----
 dlls/d3dx9_36/Makefile.in     |    9 ---------
 dlls/winspool.drv/Makefile.in |    9 ---------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 241fc52..965302f 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -15,7 +15,7 @@ MINGWAR     = @MINGWAR@
 DEFS        = -D__WINESRC__ $(EXTRADEFS)
 BASEMODULE  = $(MODULE:%.dll=%)
 MAINSPEC    = $(BASEMODULE).spec
-SPEC_DEF    = lib$(BASEMODULE).def
+SPEC_DEF    = $(BASEMODULE).def
 WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
 ALL_OBJS    = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res)
 ALL_LIBS    = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
@@ -47,15 +47,15 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)

$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)

-lib$(BASEMODULE).def: $(MAINSPEC)
+$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
    $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)

-lib$(BASEMODULE).def.a: $(IMPLIB_OBJS)
+$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
    $(RM) $@
    $(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS)
    $(RANLIB) $@

-lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS)
+$(IMPORTLIB:%=lib%.a): $(SPEC_DEF) $(IMPLIB_OBJS)
    $(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
    $(MINGWAR) rs $@ $(IMPLIB_OBJS)

@@ -106,7 +106,7 @@ uninstall::
 # Misc. rules

clean::
-	$(RM) $(SPEC_DEF)
+	$(RM) $(SPEC_DEF) $(IMPORTLIBFILE)

$(SPEC_DEF) $(SPEC_SRCS16:.spec=.spec.o): $(WINEBUILD)

diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index af1000f..3b0f062 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -11,13 +11,4 @@ C_SRCS = \

@MAKE_DLL_RULES@

-libd3dx9.def: $(MAINSPEC)
-	$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
-
-libd3dx9.a: $(SPEC_DEF)
-	$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
-
-clean::
-	$(RM) $(IMPORTLIBFILE)
-
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index 2fe1e51..bd87824 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -15,13 +15,4 @@ RC_SRCS = winspool.rc

@MAKE_DLL_RULES@

-libwinspool.def: $(MAINSPEC)
-	$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
-
-libwinspool.a: $(SPEC_DEF)
-	$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
-
-clean::
-	$(RM) $(IMPORTLIBFILE)
-
 @DEPENDENCIES@  # everything below this line is overwritten by make depend