makefiles: Simplify the use of the IMPORTLIB variable in the DLL makefiles.
Only specify the root to keep platform-specifics out of the individual
DLL makefiles.
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 5d897bb..fde11e4 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -20,7 +20,8 @@
ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res)
ALL_LIBS = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
-STATICIMPLIB= $(IMPORTLIB:.def=.def.a)
+IMPORTLIBFILE = $(IMPORTLIB:%=lib%.$(IMPLIBEXT))
+STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a)
DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%)
INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine
@@ -42,7 +43,7 @@
.PHONY: implib $(IMPLIB_SRCS:%=__static_implib__%)
-all implib: $(IMPORTLIB) $(IMPLIB_SRCS:%=__static_implib__%)
+all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
@@ -84,8 +85,8 @@
.PHONY: install_static_implib_def install_static_implib_a
.PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
-$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy
- $(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
+$(IMPORTLIB:%=_install_/%): $(IMPORTLIBFILE) $(DESTDIR)$(dlldir) dummy
+ $(INSTALL_DATA) $(IMPORTLIBFILE) $(DESTDIR)$(dlldir)/$(IMPORTLIBFILE)
install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) dummy
$(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB)
@@ -100,7 +101,7 @@
install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
uninstall::
- -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB)
+ -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB)
# Misc. rules
diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in
index de1de42..f96f5c3 100644
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = activeds.dll
-IMPORTLIB = libactiveds.$(IMPLIBEXT)
+IMPORTLIB = activeds
IMPORTS = kernel32
C_SRCS = activeds_main.c
diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in
index 2c68895..072bda1 100644
--- a/dlls/advapi32/Makefile.in
+++ b/dlls/advapi32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = advapi32.dll
-IMPORTLIB = libadvapi32.$(IMPLIBEXT)
+IMPORTLIB = advapi32
IMPORTS = kernel32 ntdll
EXTRALIBS = @SECURITYLIB@
diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in
index 0cdfc83..c1d96e5 100644
--- a/dlls/advpack/Makefile.in
+++ b/dlls/advpack/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = advpack.dll
-IMPORTLIB = libadvpack.$(IMPLIBEXT)
+IMPORTLIB = advpack
IMPORTS = ole32 setupapi version advapi32 kernel32 ntdll
C_SRCS = \
diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in
index 413c50d..124dc77 100644
--- a/dlls/atl/Makefile.in
+++ b/dlls/atl/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = atl.dll
-IMPORTLIB = libatl.$(IMPLIBEXT)
+IMPORTLIB = atl
IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in
index db85b4d..8b9dbad 100644
--- a/dlls/avicap32/Makefile.in
+++ b/dlls/avicap32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = avicap32.dll
-IMPORTLIB = libavicap32.$(IMPLIBEXT)
+IMPORTLIB = avicap32
IMPORTS = kernel32 ntdll
C_SRCS = avicap32_main.c
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 37169e8..9c5a9d2 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = avifil32.dll
-IMPORTLIB = libavifil32.$(IMPLIBEXT)
+IMPORTLIB = avifil32
IMPORTS = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in
index 2f36447..91b7eb5 100644
--- a/dlls/cabinet/Makefile.in
+++ b/dlls/cabinet/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = cabinet.dll
-IMPORTLIB = libcabinet.$(IMPLIBEXT)
+IMPORTLIB = cabinet
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in
index f62c954..188ab3b 100644
--- a/dlls/capi2032/Makefile.in
+++ b/dlls/capi2032/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = capi2032.dll
-IMPORTLIB = libcapi2032.$(IMPLIBEXT)
+IMPORTLIB = capi2032
IMPORTS = kernel32
C_SRCS = cap20wxx.c
diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in
index 6b6aa74..93c53fc 100644
--- a/dlls/cards/Makefile.in
+++ b/dlls/cards/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = cards.dll
-IMPORTLIB = libcards.$(IMPLIBEXT)
+IMPORTLIB = cards
IMPORTS = user32 gdi32 kernel32
C_SRCS = \
diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in
index 9974fbc..83545ac 100644
--- a/dlls/cfgmgr32/Makefile.in
+++ b/dlls/cfgmgr32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = cfgmgr32.dll
-IMPORTLIB = libcfgmgr32.$(IMPLIBEXT)
+IMPORTLIB = cfgmgr32
IMPORTS = setupapi kernel32
@MAKE_DLL_RULES@
diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in
index fdab576..70306b4 100644
--- a/dlls/clusapi/Makefile.in
+++ b/dlls/clusapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = clusapi.dll
-IMPORTLIB = libclusapi.$(IMPLIBEXT)
+IMPORTLIB = clusapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index 573f8f0..bf62a22 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comctl32.dll
-IMPORTLIB = libcomctl32.$(IMPLIBEXT)
+IMPORTLIB = comctl32
IMPORTS = user32 gdi32 advapi32 kernel32
DELAYIMPORTS = winmm uxtheme
diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in
index 581c80e..23ece55 100644
--- a/dlls/comdlg32/Makefile.in
+++ b/dlls/comdlg32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comdlg32.dll
-IMPORTLIB = libcomdlg32.$(IMPLIBEXT)
+IMPORTLIB = comdlg32
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = ole32
EXTRALIBS = -luuid
diff --git a/dlls/compstui/Makefile.in b/dlls/compstui/Makefile.in
index 7aaa129..3a2706b 100644
--- a/dlls/compstui/Makefile.in
+++ b/dlls/compstui/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = compstui.dll
-IMPORTLIB = libcompstui.$(IMPLIBEXT)
+IMPORTLIB = compstui
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in
index 3e75b17..e91474f 100644
--- a/dlls/credui/Makefile.in
+++ b/dlls/credui/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = credui.dll
-IMPORTLIB = libcredui.$(IMPLIBEXT)
+IMPORTLIB = credui
IMPORTS = comctl32 user32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index da33472..c53ac78 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = crtdll.dll
-IMPORTLIB = libcrtdll.$(IMPLIBEXT)
+IMPORTLIB = crtdll
IMPORTS = msvcrt kernel32
MODCFLAGS = @BUILTINFLAG@
EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in
index 47ea469..767a5b9 100644
--- a/dlls/crypt32/Makefile.in
+++ b/dlls/crypt32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = crypt32.dll
-IMPORTLIB = libcrypt32.$(IMPLIBEXT)
+IMPORTLIB = crypt32
IMPORTS = user32 advapi32 kernel32 ntdll
DELAYIMPORTS = imagehlp
diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in
index 3377b70..417086b 100644
--- a/dlls/cryptdll/Makefile.in
+++ b/dlls/cryptdll/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = cryptdll.dll
-IMPORTLIB = libcryptdll.$(IMPLIBEXT)
+IMPORTLIB = cryptdll
IMPORTS = advapi32 kernel32
C_SRCS = \
diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in
index 2506ea9..749da1a 100644
--- a/dlls/cryptnet/Makefile.in
+++ b/dlls/cryptnet/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = cryptnet.dll
-IMPORTLIB = libcryptnet.$(IMPLIBEXT)
+IMPORTLIB = cryptnet
IMPORTS = crypt32 kernel32
DELAYIMPORTS = wininet
diff --git a/dlls/ctl3d32/Makefile.in b/dlls/ctl3d32/Makefile.in
index 05614e4..c7f6936 100644
--- a/dlls/ctl3d32/Makefile.in
+++ b/dlls/ctl3d32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ctl3d32.dll
-IMPORTLIB = libctl3d32.$(IMPLIBEXT)
+IMPORTLIB = ctl3d32
IMPORTS = user32 kernel32
C_SRCS = ctl3d32.c
diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in
index fea37f6..003b6f4 100644
--- a/dlls/d3d8/Makefile.in
+++ b/dlls/d3d8/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3d8.dll
-IMPORTLIB = libd3d8.$(IMPLIBEXT)
+IMPORTLIB = d3d8
IMPORTS = wined3d kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 1367e76..6ffdb44 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3d9.dll
-IMPORTLIB = libd3d9.$(IMPLIBEXT)
+IMPORTLIB = d3d9
IMPORTS = wined3d kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in
index ae6dbd8..2ab352f 100644
--- a/dlls/d3dim/Makefile.in
+++ b/dlls/d3dim/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3dim.dll
-IMPORTLIB = libd3dim.$(IMPLIBEXT)
+IMPORTLIB = d3dim
IMPORTS = kernel32
C_SRCS = d3dim_main.c
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index f070c1d..ae7982c 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3drm.dll
-IMPORTLIB = libd3drm.$(IMPLIBEXT)
+IMPORTLIB = d3drm
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in
index cbee6e5..35e4d83 100644
--- a/dlls/d3dx8/Makefile.in
+++ b/dlls/d3dx8/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3dx8.dll
-IMPORTLIB = libd3dx8.$(IMPLIBEXT)
+IMPORTLIB = d3dx8
IMPORTS = kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index 9c3e080..af1000f 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3dx9_36.dll
-IMPORTLIB = libd3dx9.$(IMPLIBEXT)
+IMPORTLIB = d3dx9
IMPORTS = d3d9 d3dx8 kernel32
C_SRCS = \
@@ -18,6 +18,6 @@
$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
clean::
- $(RM) $(IMPORTLIB)
+ $(RM) $(IMPORTLIBFILE)
@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in
index 6bdc04b..89c0f9a 100644
--- a/dlls/d3dxof/Makefile.in
+++ b/dlls/d3dxof/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = d3dxof.dll
-IMPORTLIB = libd3dxof.$(IMPLIBEXT)
+IMPORTLIB = d3dxof
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index fa94a1f..c089d65 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dbghelp.dll
-IMPORTLIB = libdbghelp.$(IMPLIBEXT)
+IMPORTLIB = dbghelp
IMPORTS = psapi kernel32 ntdll
DELAYIMPORTS = version
diff --git a/dlls/dciman32/Makefile.in b/dlls/dciman32/Makefile.in
index d0a953b..99c42a9 100644
--- a/dlls/dciman32/Makefile.in
+++ b/dlls/dciman32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dciman32.dll
-IMPORTLIB = libdciman32.$(IMPLIBEXT)
+IMPORTLIB = dciman32
IMPORTS = kernel32
C_SRCS = dciman_main.c
diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index f25bfc0..dc91284 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ddraw.dll
-IMPORTLIB = libddraw.$(IMPLIBEXT)
+IMPORTLIB = ddraw
IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index dad1785..3843677 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dinput.dll
-IMPORTLIB = libdinput.$(IMPLIBEXT)
+IMPORTLIB = dinput
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 62a57c6..0f09c27 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dinput8.dll
-IMPORTLIB = libdinput8.$(IMPLIBEXT)
+IMPORTLIB = dinput8
IMPORTS = dinput ole32 advapi32 kernel32
EXTRALIBS = -luuid -ldxguid
diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in
index 8daeff2..99a17ab 100644
--- a/dlls/dmusic32/Makefile.in
+++ b/dlls/dmusic32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmusic32.dll
-IMPORTLIB = libdmusic32.$(IMPLIBEXT)
+IMPORTLIB = dmusic32
IMPORTS = kernel32
EXTRALIBS = -luuid
diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in
index 51c254a..a55881a 100644
--- a/dlls/dnsapi/Makefile.in
+++ b/dlls/dnsapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dnsapi.dll
-IMPORTLIB = libdnsapi.$(IMPLIBEXT)
+IMPORTLIB = dnsapi
IMPORTS = netapi32 kernel32
EXTRALIBS = @RESOLVLIBS@
diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in
index c1d0ad9..59f6bf1 100644
--- a/dlls/dplay/Makefile.in
+++ b/dlls/dplay/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplay.dll
-IMPORTLIB = libdplay.$(IMPLIBEXT)
+IMPORTLIB = dplay
IMPORTS = dplayx kernel32
RC_SRCS = version.rc
diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in
index 9e3461d..0ed8695 100644
--- a/dlls/dplayx/Makefile.in
+++ b/dlls/dplayx/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplayx.dll
-IMPORTLIB = libdplayx.$(IMPLIBEXT)
+IMPORTLIB = dplayx
IMPORTS = winmm ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in
index a3641c3..881eca1 100644
--- a/dlls/dpnet/Makefile.in
+++ b/dlls/dpnet/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dpnet.dll
-IMPORTLIB = libdpnet.$(IMPLIBEXT)
+IMPORTLIB = dpnet
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index c7e8345..1ed40a5 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dsound.dll
-IMPORTLIB = libdsound.$(IMPLIBEXT)
+IMPORTLIB = dsound
IMPORTS = winmm ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = -ldxguid -luuid
diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
index 4a48e72..1868eb2 100644
--- a/dlls/dwmapi/Makefile.in
+++ b/dlls/dwmapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dwmapi.dll
-IMPORTLIB = libdwmapi.$(IMPLIBEXT)
+IMPORTLIB = dwmapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index 4b1b961..dce15b8 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = gdi32.dll
-IMPORTLIB = libgdi32.$(IMPLIBEXT)
+IMPORTLIB = gdi32
IMPORTS = advapi32 kernel32 ntdll
EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
EXTRALIBS = @CARBONLIB@
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index 1ab0377..f71aaab 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = gdiplus.dll
-IMPORTLIB = libgdiplus.$(IMPLIBEXT)
+IMPORTLIB = gdiplus
IMPORTS = shlwapi oleaut32 ole32 user32 gdi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in
index 83c245c..98d15e8 100644
--- a/dlls/glu32/Makefile.in
+++ b/dlls/glu32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = glu32.dll
-IMPORTLIB = libglu32.$(IMPLIBEXT)
+IMPORTLIB = glu32
IMPORTS = kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in
index e1a12ac..783c99f 100644
--- a/dlls/hid/Makefile.in
+++ b/dlls/hid/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = hid.dll
-IMPORTLIB = libhid.$(IMPLIBEXT)
+IMPORTLIB = hid
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in
index 3d0262c..1c8eebf 100644
--- a/dlls/hlink/Makefile.in
+++ b/dlls/hlink/Makefile.in
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = hlink.dll
IMPORTS = shell32 ole32 advapi32 kernel32
-IMPORTLIB = libhlink.$(IMPLIBEXT)
+IMPORTLIB = hlink
DELAYIMPORTS = urlmon
EXTRALIBS = -luuid
diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in
index aa75861..5286e86 100644
--- a/dlls/icmp/Makefile.in
+++ b/dlls/icmp/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = icmp.dll
-IMPORTLIB = libicmp.$(IMPLIBEXT)
+IMPORTLIB = icmp
IMPORTS = kernel32
C_SRCS = icmp_main.c
diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in
index 7315af7..6c43efb 100644
--- a/dlls/imagehlp/Makefile.in
+++ b/dlls/imagehlp/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = imagehlp.dll
-IMPORTLIB = libimagehlp.$(IMPLIBEXT)
+IMPORTLIB = imagehlp
IMPORTS = dbghelp kernel32 ntdll
C_SRCS = \
diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in
index 3149cae..4118422 100644
--- a/dlls/imm32/Makefile.in
+++ b/dlls/imm32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = imm32.dll
-IMPORTLIB = libimm32.$(IMPLIBEXT)
+IMPORTLIB = imm32
IMPORTS = user32 gdi32 kernel32
C_SRCS = \
diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in
index 989f73a..bca5305 100644
--- a/dlls/inetcomm/Makefile.in
+++ b/dlls/inetcomm/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = inetcomm.dll
-IMPORTLIB = libinetcomm.$(IMPLIBEXT)
+IMPORTLIB = inetcomm
IMPORTS = ole32 ws2_32 user32 advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index 919e308..b52a1c0 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = iphlpapi.dll
-IMPORTLIB = libiphlpapi.$(IMPLIBEXT)
+IMPORTLIB = iphlpapi
IMPORTS = advapi32 kernel32
EXTRALIBS = @RESOLVLIBS@
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index 2d57ea2..3ac2567 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = kernel32.dll
-IMPORTLIB = libkernel32.$(IMPLIBEXT)
+IMPORTLIB = kernel32
IMPORTS = ntdll
EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in
index e50e8cd..bd3d5fb 100644
--- a/dlls/lz32/Makefile.in
+++ b/dlls/lz32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = lz32.dll
-IMPORTLIB = liblz32.$(IMPLIBEXT)
+IMPORTLIB = lz32
IMPORTS = kernel32
RC_SRCS = version.rc
diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in
index 2251c27..d587381 100644
--- a/dlls/mapi32/Makefile.in
+++ b/dlls/mapi32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mapi32.dll
-IMPORTLIB = libmapi32.$(IMPLIBEXT)
+IMPORTLIB = mapi32
IMPORTS = shlwapi shell32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in
index a76105a..c4ba2de 100644
--- a/dlls/mlang/Makefile.in
+++ b/dlls/mlang/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mlang.dll
-IMPORTLIB = libmlang.$(IMPLIBEXT)
+IMPORTLIB = mlang
IMPORTS = ole32 user32 gdi32 advapi32 kernel32
DELAYIMPORTS = oleaut32
EXTRALIBS = -luuid
diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in
index ba58c7e..fe92cf9 100644
--- a/dlls/mpr/Makefile.in
+++ b/dlls/mpr/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mpr.dll
-IMPORTLIB = libmpr.$(IMPLIBEXT)
+IMPORTLIB = mpr
IMPORTS = user32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in
index 8f47be7..9dca2d4 100644
--- a/dlls/mprapi/Makefile.in
+++ b/dlls/mprapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mprapi.dll
-IMPORTLIB = libmprapi.$(IMPLIBEXT)
+IMPORTLIB = mprapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index efe36a7..8724d3b 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msacm32.dll
-IMPORTLIB = libmsacm32.$(IMPLIBEXT)
+IMPORTLIB = msacm32
IMPORTS = winmm user32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in
index 19bf1f8..7f65b12 100644
--- a/dlls/mscms/Makefile.in
+++ b/dlls/mscms/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mscms.dll
-IMPORTLIB = libmscms.$(IMPLIBEXT)
+IMPORTLIB = mscms
IMPORTS = advapi32 kernel32
EXTRALIBS = @LCMSLIBS@
diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index a0b924e..207a150 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msdmo.dll
-IMPORTLIB = libmsdmo.$(IMPLIBEXT)
+IMPORTLIB = msdmo
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 45094e6..8cf0b87 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mshtml.dll
-IMPORTLIB = libmshtml.$(IMPLIBEXT)
+IMPORTLIB = mshtml
IMPORTS = urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 9102924..6568c31 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msi.dll
-IMPORTLIB = libmsi.$(IMPLIBEXT)
+IMPORTLIB = msi
IMPORTS = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = odbccp32
EXTRALIBS = -luuid
diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in
index b7bc614..b2d85e4 100644
--- a/dlls/msimg32/Makefile.in
+++ b/dlls/msimg32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msimg32.dll
-IMPORTLIB = libmsimg32.$(IMPLIBEXT)
+IMPORTLIB = msimg32
IMPORTS = gdi32 kernel32
C_SRCS = msimg32_main.c
diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in
index 0654a30..5492e83 100644
--- a/dlls/msvcr71/Makefile.in
+++ b/dlls/msvcr71/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvcr71.dll
-IMPORTLIB = libmsvcr71.$(IMPLIBEXT)
+IMPORTLIB = msvcr71
IMPORTS = msvcrt kernel32
C_SRCS = \
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 6828f48..7c2b25e 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvcrt.dll
-IMPORTLIB = libmsvcrt.$(IMPLIBEXT)
+IMPORTLIB = msvcrt
IMPORTS = kernel32 ntdll
DELAYIMPORTS = user32
diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in
index 3bab18d..1179be2 100644
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvcrt20.dll
-IMPORTLIB = libmsvcrt20.$(IMPLIBEXT)
+IMPORTLIB = msvcrt20
IMPORTS = msvcrt kernel32
C_SRCS = msvcrt20.c
diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in
index 862aa11..b053a96 100644
--- a/dlls/msvcrt40/Makefile.in
+++ b/dlls/msvcrt40/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvcrt40.dll
-IMPORTLIB = libmsvcrt40.$(IMPLIBEXT)
+IMPORTLIB = msvcrt40
IMPORTS = msvcrt kernel32
C_SRCS = \
diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in
index 257c3d8..904b363 100644
--- a/dlls/msvcrtd/Makefile.in
+++ b/dlls/msvcrtd/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvcrtd.dll
-IMPORTLIB = libmsvcrtd.$(IMPLIBEXT)
+IMPORTLIB = msvcrtd
IMPORTS = msvcrt kernel32 ntdll
MODCFLAGS = @BUILTINFLAG@
EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 5e3218c..d152cc2 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msvfw32.dll
-IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
+IMPORTLIB = msvfw32
IMPORTS = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll
C_SRCS = \
diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in
index dd059d3..b8fe898 100644
--- a/dlls/mswsock/Makefile.in
+++ b/dlls/mswsock/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mswsock.dll
-IMPORTLIB = libmswsock.$(IMPLIBEXT)
+IMPORTLIB = mswsock
IMPORTS = ws2_32 kernel32
C_SRCS = \
diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in
index 79ebd6d..7f145fb 100644
--- a/dlls/nddeapi/Makefile.in
+++ b/dlls/nddeapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = nddeapi.dll
-IMPORTLIB = libnddeapi.$(IMPLIBEXT)
+IMPORTLIB = nddeapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 208fdca..5ee3aac 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = netapi32.dll
-IMPORTLIB = libnetapi32.$(IMPLIBEXT)
+IMPORTLIB = netapi32
IMPORTS = iphlpapi ws2_32 advapi32 kernel32 ntdll
C_SRCS = \
diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in
index 6cc4bf3..391e87a 100644
--- a/dlls/newdev/Makefile.in
+++ b/dlls/newdev/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = newdev.dll
-IMPORTLIB = libnewdev.$(IMPLIBEXT)
+IMPORTLIB = newdev
IMPORTS = kernel32
C_SRCS = main.c
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 4ff9a91..345b88f 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ntdll.dll
-IMPORTLIB = libntdll.$(IMPLIBEXT)
+IMPORTLIB = ntdll
EXTRALIBS = @IOKITLIB@
EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in
index 2649a36..21255f1 100644
--- a/dlls/ntdsapi/Makefile.in
+++ b/dlls/ntdsapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ntdsapi.dll
-IMPORTLIB = libntdsapi.$(IMPLIBEXT)
+IMPORTLIB = ntdsapi
IMPORTS = user32 kernel32
C_SRCS = \
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index 2e91316..f7787d8 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ntoskrnl.exe
-IMPORTLIB = libntoskrnl.exe.$(IMPLIBEXT)
+IMPORTLIB = ntoskrnl.exe
IMPORTS = kernel32 ntdll
C_SRCS = \
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index 45bb3a2..dc685ae 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = odbc32.dll
-IMPORTLIB = libodbc32.$(IMPLIBEXT)
+IMPORTLIB = odbc32
IMPORTS = advapi32 kernel32
C_SRCS = \
diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in
index ab715e1..71d1a85 100644
--- a/dlls/odbccp32/Makefile.in
+++ b/dlls/odbccp32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = odbccp32.dll
-IMPORTLIB = libodbccp32.$(IMPLIBEXT)
+IMPORTLIB = odbccp32
IMPORTS = advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index cc3867a..d9369d4 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ole32.dll
-IMPORTLIB = libole32.$(IMPLIBEXT)
+IMPORTLIB = ole32
IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
EXTRALIBS = -luuid
diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index d52d548..5822916 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = oleacc.dll
-IMPORTLIB = liboleacc.$(IMPLIBEXT)
+IMPORTLIB = oleacc
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 18390a6..6a8f821 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = oleaut32.dll
-IMPORTLIB = liboleaut32.$(IMPLIBEXT)
+IMPORTLIB = oleaut32
IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32 urlmon
EXTRALIBS = -luuid
diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in
index 334e8e1..ec511ab 100644
--- a/dlls/olecli32/Makefile.in
+++ b/dlls/olecli32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = olecli32.dll
-IMPORTLIB = libolecli32.$(IMPLIBEXT)
+IMPORTLIB = olecli32
IMPORTS = ole32 gdi32 kernel32
C_SRCS = \
diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in
index e2ea707..73f079b 100644
--- a/dlls/oledlg/Makefile.in
+++ b/dlls/oledlg/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = oledlg.dll
-IMPORTLIB = liboledlg.$(IMPLIBEXT)
+IMPORTLIB = oledlg
IMPORTS = ole32 comdlg32 user32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/olepro32/Makefile.in b/dlls/olepro32/Makefile.in
index dd8c5e6..ad4be0e 100644
--- a/dlls/olepro32/Makefile.in
+++ b/dlls/olepro32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = olepro32.dll
-IMPORTLIB = libolepro32.$(IMPLIBEXT)
+IMPORTLIB = olepro32
IMPORTS = oleaut32 kernel32
C_SRCS = olepro32stubs.c
diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in
index 3a234dd..25c3dec 100644
--- a/dlls/olesvr32/Makefile.in
+++ b/dlls/olesvr32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = olesvr32.dll
-IMPORTLIB = libolesvr32.$(IMPLIBEXT)
+IMPORTLIB = olesvr32
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 7c06f5e..d6f19c3 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = opengl32.dll
-IMPORTLIB = libopengl32.$(IMPLIBEXT)
+IMPORTLIB = opengl32
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in
index d9920ea..4983efd 100644
--- a/dlls/pdh/Makefile.in
+++ b/dlls/pdh/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = pdh.dll
-IMPORTLIB = libpdh.$(IMPLIBEXT)
+IMPORTLIB = pdh
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in
index 76fd679..3023b0c 100644
--- a/dlls/powrprof/Makefile.in
+++ b/dlls/powrprof/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = powrprof.dll
-IMPORTLIB = libpowrprof.$(IMPLIBEXT)
+IMPORTLIB = powrprof
IMPORTS = advapi32 kernel32 ntdll
C_SRCS = powrprof.c
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 8bd5546..557ac12 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = psapi.dll
-IMPORTLIB = libpsapi.$(IMPLIBEXT)
+IMPORTLIB = psapi
IMPORTS = kernel32 ntdll
C_SRCS = \
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 8f714cd..e183f20 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = quartz.dll
-IMPORTLIB = libquartz.$(IMPLIBEXT)
+IMPORTLIB = quartz
IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32
EXTRALIBS = -lstrmiids -luuid
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index 11c2a65..12bbd65 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = rasapi32.dll
-IMPORTLIB = librasapi32.$(IMPLIBEXT)
+IMPORTLIB = rasapi32
IMPORTS = kernel32
C_SRCS = rasapi.c
diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in
index 7dd8ceb..b263c55 100644
--- a/dlls/resutils/Makefile.in
+++ b/dlls/resutils/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = resutils.dll
-IMPORTLIB = libresutils.$(IMPLIBEXT)
+IMPORTLIB = resutils
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in
index 6b974e5..1f2e451 100644
--- a/dlls/riched20/Makefile.in
+++ b/dlls/riched20/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = riched20.dll
-IMPORTLIB = libriched20.$(IMPLIBEXT)
+IMPORTLIB = riched20
IMPORTS = ole32 imm32 user32 gdi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index 9fe0026..2daa69d 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = rpcrt4.dll
-IMPORTLIB = librpcrt4.$(IMPLIBEXT)
+IMPORTLIB = rpcrt4
IMPORTS = iphlpapi advapi32 kernel32 ntdll
DELAYIMPORTS = secur32 user32
EXTRALIBS = -luuid
diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in
index 7c5a054..40cbd95 100644
--- a/dlls/rsaenh/Makefile.in
+++ b/dlls/rsaenh/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = rsaenh.dll
-IMPORTLIB = librsaenh.$(IMPLIBEXT)
+IMPORTLIB = rsaenh
IMPORTS = crypt32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in
index 36ae057..df9695a 100644
--- a/dlls/secur32/Makefile.in
+++ b/dlls/secur32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = secur32.dll
-IMPORTLIB = libsecur32.$(IMPLIBEXT)
+IMPORTLIB = secur32
IMPORTS = netapi32 advapi32 kernel32 ntdll
DELAYIMPORTS = crypt32
diff --git a/dlls/sensapi/Makefile.in b/dlls/sensapi/Makefile.in
index 1924b70..fcf99f1 100644
--- a/dlls/sensapi/Makefile.in
+++ b/dlls/sensapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sensapi.dll
-IMPORTLIB = libsensapi.$(IMPLIBEXT)
+IMPORTLIB = sensapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index bdd50f6..3504a5e 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = serialui.dll
-IMPORTLIB = libserialui.$(IMPLIBEXT)
+IMPORTLIB = serialui
IMPORTS = user32 advapi32 kernel32
C_SRCS = \
diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in
index 3ecbddf..2830335 100644
--- a/dlls/setupapi/Makefile.in
+++ b/dlls/setupapi/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = setupapi.dll
-IMPORTLIB = libsetupapi.$(IMPLIBEXT)
+IMPORTLIB = setupapi
IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll
DELAYIMPORTS = shell32
EXTRALIBS = -luuid
diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in
index 9c38408..ef2ff22 100644
--- a/dlls/sfc/Makefile.in
+++ b/dlls/sfc/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sfc.dll
-IMPORTLIB = libsfc.$(IMPLIBEXT)
+IMPORTLIB = sfc
IMPORTS = sfc_os kernel32
C_SRCS = sfc_main.c
diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in
index 9180f94..725ebd8 100644
--- a/dlls/sfc_os/Makefile.in
+++ b/dlls/sfc_os/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sfc_os.dll
-IMPORTLIB = libsfc_os.$(IMPLIBEXT)
+IMPORTLIB = sfc_os
IMPORTS = kernel32
C_SRCS = sfc_os.c
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in
index 7ad0950..a73e3c4 100644
--- a/dlls/shdocvw/Makefile.in
+++ b/dlls/shdocvw/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shdocvw.dll
-IMPORTLIB = libshdocvw.$(IMPLIBEXT)
+IMPORTLIB = shdocvw
IMPORTS = shell32 shlwapi user32 advapi32 kernel32
DELAYIMPORTS = urlmon ole32 oleaut32
EXTRALIBS = -luuid
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 583b0f7..dda960a3 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shell32.dll
-IMPORTLIB = libshell32.$(IMPLIBEXT)
+IMPORTLIB = shell32
IMPORTS = shlwapi comctl32 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = ole32 oleaut32
EXTRALIBS = -luuid
diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in
index 826157d..507f331 100644
--- a/dlls/shfolder/Makefile.in
+++ b/dlls/shfolder/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shfolder.dll
-IMPORTLIB = libshfolder.$(IMPLIBEXT)
+IMPORTLIB = shfolder
IMPORTS = shell32 kernel32
RC_SRCS = version.rc
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index d662f47..5420ee5 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shlwapi.dll
-IMPORTLIB = libshlwapi.$(IMPLIBEXT)
+IMPORTLIB = shlwapi
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version
EXTRALIBS = -luuid
diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in
index 20fec6f..9baa876 100644
--- a/dlls/slc/Makefile.in
+++ b/dlls/slc/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = slc.dll
-IMPORTLIB = libslc.$(IMPLIBEXT)
+IMPORTLIB = slc
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in
index 74bd2ab..a9e5420 100644
--- a/dlls/snmpapi/Makefile.in
+++ b/dlls/snmpapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = snmpapi.dll
-IMPORTLIB = libsnmpapi.$(IMPLIBEXT)
+IMPORTLIB = snmpapi
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in
index 6d2a310..35e7038 100644
--- a/dlls/spoolss/Makefile.in
+++ b/dlls/spoolss/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = spoolss.dll
-IMPORTLIB = libspoolss.$(IMPLIBEXT)
+IMPORTLIB = spoolss
IMPORTS = winspool kernel32
C_SRCS = \
diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index 27c897d..dd977ac 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sti.dll
-IMPORTLIB = libsti.$(IMPLIBEXT)
+IMPORTLIB = sti
IMPORTS = kernel32
C_SRCS = sti_main.c
diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in
index 393e2dd..8d5f565 100644
--- a/dlls/tapi32/Makefile.in
+++ b/dlls/tapi32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = tapi32.dll
-IMPORTLIB = libtapi32.$(IMPLIBEXT)
+IMPORTLIB = tapi32
IMPORTS = advapi32 kernel32
C_SRCS = \
diff --git a/dlls/unicows/Makefile.in b/dlls/unicows/Makefile.in
index d107da2..bc7f8db 100644
--- a/dlls/unicows/Makefile.in
+++ b/dlls/unicows/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = unicows.dll
-IMPORTLIB = libunicows.$(IMPLIBEXT)
+IMPORTLIB = unicows
IMPORTS = avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool \
rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 kernel32
diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in
index 92dea4b..63e2228 100644
--- a/dlls/url/Makefile.in
+++ b/dlls/url/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = url.dll
-IMPORTLIB = liburl.$(IMPLIBEXT)
+IMPORTLIB = url
IMPORTS = shell32 shlwapi kernel32
C_SRCS = url_main.c
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index bab6d03..c82c1e9 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = urlmon.dll
-IMPORTLIB = liburlmon.$(IMPLIBEXT)
+IMPORTLIB = urlmon
IMPORTS = ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid
diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 33e9cee..023a98b 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = user32.dll
-IMPORTLIB = libuser32.$(IMPLIBEXT)
+IMPORTLIB = user32
IMPORTS = gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = imm32
diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in
index 9d716d5..0aa59ca 100644
--- a/dlls/usp10/Makefile.in
+++ b/dlls/usp10/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = usp10.dll
-IMPORTLIB = libusp10.$(IMPLIBEXT)
+IMPORTLIB = usp10
IMPORTS = gdi32 kernel32
C_SRCS = \
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 3fcd127..da6944f 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = uxtheme.dll
-IMPORTLIB = libuxtheme.$(IMPLIBEXT)
+IMPORTLIB = uxtheme
IMPORTS = user32 gdi32 advapi32 kernel32
DELAYIMPORTS = msimg32
diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in
index d35da1a1..0dd4f50 100644
--- a/dlls/vdmdbg/Makefile.in
+++ b/dlls/vdmdbg/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = vdmdbg.dll
-IMPORTLIB = libvdmdbg.$(IMPLIBEXT)
+IMPORTLIB = vdmdbg
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 387d01b..9fc0fbe 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = version.dll
-IMPORTLIB = libversion.$(IMPLIBEXT)
+IMPORTLIB = version
IMPORTS = lz32 kernel32 ntdll
C_SRCS = \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 9ec6494..f6a49b9 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wined3d.dll
-IMPORTLIB = libwined3d.$(IMPLIBEXT)
+IMPORTLIB = wined3d
IMPORTS = user32 gdi32 advapi32 kernel32
EXTRALIBS = -luuid
diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in
index aae66ec..50ce888 100644
--- a/dlls/winedos/Makefile.in
+++ b/dlls/winedos/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winedos.dll
-IMPORTLIB = libwinedos.$(IMPLIBEXT)
+IMPORTLIB = winedos
IMPORTS = user32 kernel32 ntdll
SPEC_SRCS16 = wprocs.spec
diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in
index 4d0494e..116c9fd 100644
--- a/dlls/wininet/Makefile.in
+++ b/dlls/wininet/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wininet.dll
-IMPORTLIB = libwininet.$(IMPLIBEXT)
+IMPORTLIB = wininet
IMPORTS = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = secur32 crypt32
EXTRALIBS = @SOCKETLIBS@
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 850a656..bb92807 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winmm.dll
-IMPORTLIB = libwinmm.$(IMPLIBEXT)
+IMPORTLIB = winmm
IMPORTS = user32 advapi32 kernel32 ntdll
C_SRCS = \
diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in
index 2a4e074..ed062d8 100644
--- a/dlls/winnls32/Makefile.in
+++ b/dlls/winnls32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winnls32.dll
-IMPORTLIB = libwinnls32.$(IMPLIBEXT)
+IMPORTLIB = winnls32
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in
index de8a2b6..796280d 100644
--- a/dlls/winscard/Makefile.in
+++ b/dlls/winscard/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winscard.dll
-IMPORTLIB = libwinscard.$(IMPLIBEXT)
+IMPORTLIB = winscard
IMPORTS = kernel32
C_SRCS = \
diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in
index f9ae2a5..2fe1e51 100644
--- a/dlls/winspool.drv/Makefile.in
+++ b/dlls/winspool.drv/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winspool.drv
-IMPORTLIB = libwinspool.$(IMPLIBEXT)
+IMPORTLIB = winspool
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
C_SRCS = \
@@ -22,6 +22,6 @@
$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
clean::
- $(RM) $(IMPORTLIB)
+ $(RM) $(IMPORTLIBFILE)
@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in
index 4ff7fc3..5c2a3c5 100644
--- a/dlls/wintab32/Makefile.in
+++ b/dlls/wintab32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wintab32.dll
-IMPORTLIB = libwintab32.$(IMPLIBEXT)
+IMPORTLIB = wintab32
IMPORTS = user32 kernel32
C_SRCS = \
diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in
index 85bbd77..6f30fd6 100644
--- a/dlls/wintrust/Makefile.in
+++ b/dlls/wintrust/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wintrust.dll
-IMPORTLIB = libwintrust.$(IMPLIBEXT)
+IMPORTLIB = wintrust
IMPORTS = crypt32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = imagehlp
diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 562b1b1..b7126b3 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wldap32.dll
-IMPORTLIB = libwldap32.$(IMPLIBEXT)
+IMPORTLIB = wldap32
IMPORTS = user32 kernel32
EXTRALIBS = @LDAPLIBS@
diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in
index 8cef4d0..12707b5 100644
--- a/dlls/wnaspi32/Makefile.in
+++ b/dlls/wnaspi32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wnaspi32.dll
-IMPORTLIB = libwnaspi32.$(IMPLIBEXT)
+IMPORTLIB = wnaspi32
IMPORTS = advapi32 kernel32
C_SRCS = \
diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in
index 55f0a92..e1f5098 100644
--- a/dlls/wow32/Makefile.in
+++ b/dlls/wow32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wow32.dll
-IMPORTLIB = libwow32.$(IMPLIBEXT)
+IMPORTLIB = wow32
IMPORTS = kernel32
C_SRCS = wow_main.c
diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in
index 665a8e3..1bb424f 100644
--- a/dlls/ws2_32/Makefile.in
+++ b/dlls/ws2_32/Makefile.in
@@ -4,7 +4,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ws2_32.dll
-IMPORTLIB = libws2_32.$(IMPLIBEXT)
+IMPORTLIB = ws2_32
IMPORTS = iphlpapi kernel32 ntdll
DELAYIMPORTS = user32
EXTRALIBS = @LIBPOLL@
diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index 46af82b..f0ef87a 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wsock32.dll
-IMPORTLIB = libwsock32.$(IMPLIBEXT)
+IMPORTLIB = wsock32
IMPORTS = mswsock ws2_32 iphlpapi kernel32
C_SRCS = \
diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in
index 495d8bf..9f695bb 100644
--- a/dlls/wtsapi32/Makefile.in
+++ b/dlls/wtsapi32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wtsapi32.dll
-IMPORTLIB = libwtsapi32.$(IMPLIBEXT)
+IMPORTLIB = wtsapi32
IMPORTS = kernel32
C_SRCS = \
diff --git a/tools/make_makefiles b/tools/make_makefiles
index aa10cb3..edcade7 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -405,7 +405,7 @@
if (defined $makefile{"IMPORTLIB"})
{
- if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)\.\$\(IMPLIBEXT\)/)
+ if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)/)
{
$importlibs{$module} = $1;
}
@@ -511,12 +511,12 @@
{
my $dir = $directories{$mod};
my $lib = $importlibs{$mod};
- if ($lib ne "lib" . $dir) { push @lib_symlinks, $mod; }
+ if ($lib ne $dir) { push @lib_symlinks, $mod; }
}
$text .= "IMPORT_SYMLINKS =";
foreach my $mod (sort @lib_symlinks)
{
- $text .= sprintf " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod};
+ $text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod};
}
$text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
@@ -526,9 +526,9 @@
}
foreach my $mod (sort keys %importlibs)
{
- $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(IMPLIBEXT)";
+ $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)";
next unless defined $static_implibs{$mod};
- $text .= " \\\n\t$directories{$mod}/$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
+ $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
}
$text .= "\n\n";
$text .= "implib: \$(IMPORT_LIBS)\n\n";
@@ -540,16 +540,16 @@
my $lib = $importlibs{$mod};
my $spec = $mod;
$spec =~ s/\.dll$//;
- $text .= sprintf "%s/%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(IMPLIBEXT)\n\n", $dir, $lib;
+ $text .= sprintf "%s/lib%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
+ $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(IMPLIBEXT)\n\n", $dir, $lib;
next unless $static_implibs{$mod};
- $text .= sprintf "%s/%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
+ $text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
+ $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
}
foreach my $mod (sort @lib_symlinks)
{
my $dir = $directories{$mod};
- my $lib = $importlibs{$mod} . ".\$(IMPLIBEXT)";
+ my $lib = "lib" . $importlibs{$mod} . ".\$(IMPLIBEXT)";
$text .= sprintf "%s: %s/%s\n", $lib, $dir, $lib;
$text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\n\n", $dir, $lib;
}
@@ -576,7 +576,7 @@
foreach my $mod (sort @lib_symlinks)
{
- push @ignores, "dlls/$importlibs{$mod}.def";
+ push @ignores, "dlls/lib$importlibs{$mod}.def";
}
foreach my $mod (sort keys %directories)
{
@@ -585,7 +585,7 @@
}
foreach my $mod (sort keys %importlibs)
{
- push @ignores, "dlls/$directories{$mod}/$importlibs{$mod}.def";
+ push @ignores, "dlls/$directories{$mod}/lib$importlibs{$mod}.def";
}
return @ignores;
