makefiles: Simplify the use of the IMPORTLIB variable in the DLL makefiles.

dlls/Makedll.rules.in

@@ -20,7 +20,8 @@ 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)
 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 @@ $(MODULE): $(RCOBJS) $(OBJS) $(SPEC_DEF) Makefile.in
 
 .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 @@ doc-sgml: $(C_SRCS) dummy
 .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-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy
 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
 

dlls/activeds/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = activeds.dll
-IMPORTLIB = libactiveds.$(IMPLIBEXT)
+IMPORTLIB = activeds
 IMPORTS   = kernel32
 
 C_SRCS = activeds_main.c

dlls/advapi32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advapi32.dll
-IMPORTLIB = libadvapi32.$(IMPLIBEXT)
+IMPORTLIB = advapi32
 IMPORTS   = kernel32 ntdll
 EXTRALIBS = @SECURITYLIB@
 

dlls/advpack/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = advpack.dll
-IMPORTLIB = libadvpack.$(IMPLIBEXT)
+IMPORTLIB = advpack
 IMPORTS   = ole32 setupapi version advapi32 kernel32 ntdll
 
 C_SRCS = \

dlls/atl/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = atl.dll
-IMPORTLIB = libatl.$(IMPLIBEXT)
+IMPORTLIB = atl
 IMPORTS   = ole32 oleaut32 user32 gdi32 advapi32 kernel32
 EXTRALIBS = -luuid
 

dlls/avicap32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avicap32.dll
-IMPORTLIB = libavicap32.$(IMPLIBEXT)
+IMPORTLIB = avicap32
 IMPORTS   = kernel32 ntdll
 
 C_SRCS = avicap32_main.c

dlls/avifil32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
-IMPORTLIB = libavifil32.$(IMPLIBEXT)
+IMPORTLIB = avifil32
 IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
 

dlls/cabinet/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cabinet.dll
-IMPORTLIB = libcabinet.$(IMPLIBEXT)
+IMPORTLIB = cabinet
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/capi2032/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = capi2032.dll
-IMPORTLIB = libcapi2032.$(IMPLIBEXT)
+IMPORTLIB = capi2032
 IMPORTS   = kernel32
 
 C_SRCS = cap20wxx.c

dlls/cards/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cards.dll
-IMPORTLIB = libcards.$(IMPLIBEXT)
+IMPORTLIB = cards
 IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \

dlls/cfgmgr32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cfgmgr32.dll
-IMPORTLIB = libcfgmgr32.$(IMPLIBEXT)
+IMPORTLIB = cfgmgr32
 IMPORTS   = setupapi kernel32
 
 @MAKE_DLL_RULES@

dlls/clusapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clusapi.dll
-IMPORTLIB = libclusapi.$(IMPLIBEXT)
+IMPORTLIB = clusapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/comctl32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32.dll
-IMPORTLIB = libcomctl32.$(IMPLIBEXT)
+IMPORTLIB = comctl32
 IMPORTS   = user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = winmm uxtheme
 

dlls/comdlg32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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

dlls/compstui/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = compstui.dll
-IMPORTLIB = libcompstui.$(IMPLIBEXT)
+IMPORTLIB = compstui
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/credui/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = credui.dll
-IMPORTLIB = libcredui.$(IMPLIBEXT)
+IMPORTLIB = credui
 IMPORTS   = comctl32 user32 advapi32 kernel32
 
 C_SRCS = \

dlls/crtdll/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll.dll
-IMPORTLIB = libcrtdll.$(IMPLIBEXT)
+IMPORTLIB = crtdll
 IMPORTS   = msvcrt kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt

dlls/crypt32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crypt32.dll
-IMPORTLIB = libcrypt32.$(IMPLIBEXT)
+IMPORTLIB = crypt32
 IMPORTS   = user32 advapi32 kernel32 ntdll
 DELAYIMPORTS = imagehlp
 

dlls/cryptdll/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptdll.dll
-IMPORTLIB = libcryptdll.$(IMPLIBEXT)
+IMPORTLIB = cryptdll
 IMPORTS   = advapi32 kernel32
 
 C_SRCS = \

dlls/cryptnet/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cryptnet.dll
-IMPORTLIB = libcryptnet.$(IMPLIBEXT)
+IMPORTLIB = cryptnet
 IMPORTS   = crypt32 kernel32
 DELAYIMPORTS = wininet
 

dlls/ctl3d32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctl3d32.dll
-IMPORTLIB = libctl3d32.$(IMPLIBEXT)
+IMPORTLIB = ctl3d32
 IMPORTS   = user32 kernel32
 
 C_SRCS = ctl3d32.c

dlls/d3d8/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d8.dll
-IMPORTLIB = libd3d8.$(IMPLIBEXT)
+IMPORTLIB = d3d8
 IMPORTS   = wined3d kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/d3d9/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3d9.dll
-IMPORTLIB = libd3d9.$(IMPLIBEXT)
+IMPORTLIB = d3d9
 IMPORTS   = wined3d kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/d3dim/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dim.dll
-IMPORTLIB = libd3dim.$(IMPLIBEXT)
+IMPORTLIB = d3dim
 IMPORTS   = kernel32
 
 C_SRCS = d3dim_main.c

dlls/d3drm/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3drm.dll
-IMPORTLIB = libd3drm.$(IMPLIBEXT)
+IMPORTLIB = d3drm
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/d3dx8/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx8.dll
-IMPORTLIB = libd3dx8.$(IMPLIBEXT)
+IMPORTLIB = d3dx8
 IMPORTS   = kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/d3dx9_36/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_36.dll
-IMPORTLIB = libd3dx9.$(IMPLIBEXT)
+IMPORTLIB = d3dx9
 IMPORTS   = d3d9 d3dx8 kernel32
 
 C_SRCS = \
@@ -18,6 +18,6 @@ libd3dx9.a: $(SPEC_DEF)
 	$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
 
 clean::
-	$(RM) $(IMPORTLIB)
+	$(RM) $(IMPORTLIBFILE)
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/d3dxof/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dxof.dll
-IMPORTLIB = libd3dxof.$(IMPLIBEXT)
+IMPORTLIB = d3dxof
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/dbghelp/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dbghelp.dll
-IMPORTLIB = libdbghelp.$(IMPLIBEXT)
+IMPORTLIB = dbghelp
 IMPORTS   = psapi kernel32 ntdll
 DELAYIMPORTS = version
 

dlls/dciman32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32.dll
-IMPORTLIB = libdciman32.$(IMPLIBEXT)
+IMPORTLIB = dciman32
 IMPORTS   = kernel32
 
 C_SRCS = dciman_main.c

dlls/ddraw/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ddraw.dll
-IMPORTLIB = libddraw.$(IMPLIBEXT)
+IMPORTLIB = ddraw
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
 EXTRALIBS = -ldxguid -luuid
 

dlls/dinput/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput.dll
-IMPORTLIB = libdinput.$(IMPLIBEXT)
+IMPORTLIB = dinput
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/dinput8/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dinput8.dll
-IMPORTLIB = libdinput8.$(IMPLIBEXT)
+IMPORTLIB = dinput8
 IMPORTS   = dinput ole32 advapi32 kernel32
 EXTRALIBS = -luuid -ldxguid
 

dlls/dmusic32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dmusic32.dll
-IMPORTLIB = libdmusic32.$(IMPLIBEXT)
+IMPORTLIB = dmusic32
 IMPORTS   = kernel32
 EXTRALIBS = -luuid
 

dlls/dnsapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dnsapi.dll
-IMPORTLIB = libdnsapi.$(IMPLIBEXT)
+IMPORTLIB = dnsapi
 IMPORTS   = netapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
 

dlls/dplay/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay.dll
-IMPORTLIB = libdplay.$(IMPLIBEXT)
+IMPORTLIB = dplay
 IMPORTS   = dplayx kernel32
 
 RC_SRCS = version.rc

dlls/dplayx/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx.dll
-IMPORTLIB = libdplayx.$(IMPLIBEXT)
+IMPORTLIB = dplayx
 IMPORTS   = winmm ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/dpnet/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dpnet.dll
-IMPORTLIB = libdpnet.$(IMPLIBEXT)
+IMPORTLIB = dpnet
 IMPORTS   = ole32 user32 advapi32 kernel32
 EXTRALIBS = -ldxguid -luuid
 

dlls/dsound/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound.dll
-IMPORTLIB = libdsound.$(IMPLIBEXT)
+IMPORTLIB = dsound
 IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
 EXTRALIBS = -ldxguid -luuid
 

dlls/dwmapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dwmapi.dll
-IMPORTLIB = libdwmapi.$(IMPLIBEXT)
+IMPORTLIB = dwmapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/gdi32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
-IMPORTLIB = libgdi32.$(IMPLIBEXT)
+IMPORTLIB = gdi32
 IMPORTS   = advapi32 kernel32 ntdll
 EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
 EXTRALIBS = @CARBONLIB@

dlls/gdiplus/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdiplus.dll
-IMPORTLIB = libgdiplus.$(IMPLIBEXT)
+IMPORTLIB = gdiplus
 IMPORTS   = shlwapi oleaut32 ole32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
 

dlls/glu32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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@

dlls/hid/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hid.dll
-IMPORTLIB = libhid.$(IMPLIBEXT)
+IMPORTLIB = hid
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/hlink/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = hlink.dll
 IMPORTS   = shell32 ole32 advapi32 kernel32
-IMPORTLIB = libhlink.$(IMPLIBEXT)
+IMPORTLIB = hlink
 DELAYIMPORTS = urlmon
 EXTRALIBS = -luuid
 

dlls/icmp/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp.dll
-IMPORTLIB = libicmp.$(IMPLIBEXT)
+IMPORTLIB = icmp
 IMPORTS   = kernel32
 
 C_SRCS = icmp_main.c

dlls/imagehlp/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp.dll
-IMPORTLIB = libimagehlp.$(IMPLIBEXT)
+IMPORTLIB = imagehlp
 IMPORTS   = dbghelp kernel32 ntdll
 
 C_SRCS = \

dlls/imm32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32.dll
-IMPORTLIB = libimm32.$(IMPLIBEXT)
+IMPORTLIB = imm32
 IMPORTS   = user32 gdi32 kernel32
 
 C_SRCS = \

dlls/inetcomm/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = inetcomm.dll
-IMPORTLIB = libinetcomm.$(IMPLIBEXT)
+IMPORTLIB = inetcomm
 IMPORTS   = ole32 ws2_32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
 

dlls/iphlpapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = iphlpapi.dll
-IMPORTLIB = libiphlpapi.$(IMPLIBEXT)
+IMPORTLIB = iphlpapi
 IMPORTS   = advapi32 kernel32
 EXTRALIBS = @RESOLVLIBS@
 

dlls/kernel32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 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

dlls/lz32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32.dll
-IMPORTLIB = liblz32.$(IMPLIBEXT)
+IMPORTLIB = lz32
 IMPORTS   = kernel32
 
 RC_SRCS  = version.rc

dlls/mapi32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mapi32.dll
-IMPORTLIB = libmapi32.$(IMPLIBEXT)
+IMPORTLIB = mapi32
 IMPORTS   = shlwapi shell32 kernel32
 EXTRALIBS = -luuid
 

dlls/mlang/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mlang.dll
-IMPORTLIB = libmlang.$(IMPLIBEXT)
+IMPORTLIB = mlang
 IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = oleaut32
 EXTRALIBS = -luuid

dlls/mpr/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr.dll
-IMPORTLIB = libmpr.$(IMPLIBEXT)
+IMPORTLIB = mpr
 IMPORTS   = user32 advapi32 kernel32
 
 C_SRCS = \

dlls/mprapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mprapi.dll
-IMPORTLIB = libmprapi.$(IMPLIBEXT)
+IMPORTLIB = mprapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/msacm32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.dll
-IMPORTLIB = libmsacm32.$(IMPLIBEXT)
+IMPORTLIB = msacm32
 IMPORTS   = winmm user32 advapi32 kernel32
 
 C_SRCS = \

dlls/mscms/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mscms.dll
-IMPORTLIB = libmscms.$(IMPLIBEXT)
+IMPORTLIB = mscms
 IMPORTS   = advapi32 kernel32
 EXTRALIBS = @LCMSLIBS@
 

dlls/msdmo/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msdmo.dll
-IMPORTLIB = libmsdmo.$(IMPLIBEXT)
+IMPORTLIB = msdmo
 IMPORTS   = ole32 user32 advapi32 kernel32 
 EXTRALIBS = -luuid
 

dlls/mshtml/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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

dlls/msi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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

dlls/msimg32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msimg32.dll
-IMPORTLIB = libmsimg32.$(IMPLIBEXT)
+IMPORTLIB = msimg32
 IMPORTS   = gdi32 kernel32
 
 C_SRCS = msimg32_main.c

dlls/msvcr71/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcr71.dll
-IMPORTLIB = libmsvcr71.$(IMPLIBEXT)
+IMPORTLIB = msvcr71
 IMPORTS   = msvcrt kernel32
 
 C_SRCS = \

dlls/msvcrt/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt.dll
-IMPORTLIB = libmsvcrt.$(IMPLIBEXT)
+IMPORTLIB = msvcrt
 IMPORTS   = kernel32 ntdll
 DELAYIMPORTS = user32
 

dlls/msvcrt20/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt20.dll
-IMPORTLIB = libmsvcrt20.$(IMPLIBEXT)
+IMPORTLIB = msvcrt20
 IMPORTS   = msvcrt kernel32
 
 C_SRCS = msvcrt20.c

dlls/msvcrt40/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrt40.dll
-IMPORTLIB = libmsvcrt40.$(IMPLIBEXT)
+IMPORTLIB = msvcrt40
 IMPORTS   = msvcrt kernel32
 
 C_SRCS = \

dlls/msvcrtd/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvcrtd.dll
-IMPORTLIB = libmsvcrtd.$(IMPLIBEXT)
+IMPORTLIB = msvcrtd
 IMPORTS   = msvcrt kernel32 ntdll
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt

dlls/msvfw32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
-IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
+IMPORTLIB = msvfw32
 IMPORTS   = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \

dlls/mswsock/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mswsock.dll
-IMPORTLIB = libmswsock.$(IMPLIBEXT)
+IMPORTLIB = mswsock
 IMPORTS   = ws2_32 kernel32
 
 C_SRCS = \

dlls/nddeapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = nddeapi.dll
-IMPORTLIB = libnddeapi.$(IMPLIBEXT)
+IMPORTLIB = nddeapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/netapi32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = netapi32.dll
-IMPORTLIB = libnetapi32.$(IMPLIBEXT)
+IMPORTLIB = netapi32
 IMPORTS   = iphlpapi ws2_32 advapi32 kernel32 ntdll
 
 C_SRCS = \

dlls/newdev/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = newdev.dll
-IMPORTLIB = libnewdev.$(IMPLIBEXT)
+IMPORTLIB = newdev
 IMPORTS   = kernel32
 
 C_SRCS = main.c

dlls/ntdll/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntdll.dll
-IMPORTLIB = libntdll.$(IMPLIBEXT)
+IMPORTLIB = ntdll
 EXTRALIBS = @IOKITLIB@
 EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
 

dlls/ntdsapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntdsapi.dll
-IMPORTLIB = libntdsapi.$(IMPLIBEXT)
+IMPORTLIB = ntdsapi
 IMPORTS   = user32 kernel32
 
 C_SRCS = \

dlls/ntoskrnl.exe/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntoskrnl.exe
-IMPORTLIB = libntoskrnl.exe.$(IMPLIBEXT)
+IMPORTLIB = ntoskrnl.exe
 IMPORTS   = kernel32 ntdll
 
 C_SRCS = \

dlls/odbc32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32.dll
-IMPORTLIB = libodbc32.$(IMPLIBEXT)
+IMPORTLIB = odbc32
 IMPORTS   = advapi32 kernel32
 
 C_SRCS = \

dlls/odbccp32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbccp32.dll
-IMPORTLIB = libodbccp32.$(IMPLIBEXT)
+IMPORTLIB = odbccp32
 IMPORTS   = advapi32 kernel32
 EXTRALIBS = -luuid
 

dlls/ole32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole32.dll
-IMPORTLIB = libole32.$(IMPLIBEXT)
+IMPORTLIB = ole32
 IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
 EXTRALIBS = -luuid
 

dlls/oleacc/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleacc.dll
-IMPORTLIB = liboleacc.$(IMPLIBEXT)
+IMPORTLIB = oleacc
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/oleaut32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 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

dlls/olecli32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32.dll
-IMPORTLIB = libolecli32.$(IMPLIBEXT)
+IMPORTLIB = olecli32
 IMPORTS   = ole32 gdi32 kernel32
 
 C_SRCS = \

dlls/oledlg/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg.dll
-IMPORTLIB = liboledlg.$(IMPLIBEXT)
+IMPORTLIB = oledlg
 IMPORTS   = ole32 comdlg32 user32 advapi32 kernel32
 
 C_SRCS = \

dlls/olepro32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32.dll
-IMPORTLIB = libolepro32.$(IMPLIBEXT)
+IMPORTLIB = olepro32
 IMPORTS   = oleaut32 kernel32
 
 C_SRCS = olepro32stubs.c

dlls/olesvr32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32.dll
-IMPORTLIB = libolesvr32.$(IMPLIBEXT)
+IMPORTLIB = olesvr32
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/opengl32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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@

dlls/pdh/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = pdh.dll
-IMPORTLIB = libpdh.$(IMPLIBEXT)
+IMPORTLIB = pdh
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/powrprof/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = powrprof.dll
-IMPORTLIB = libpowrprof.$(IMPLIBEXT)
+IMPORTLIB = powrprof
 IMPORTS   = advapi32 kernel32 ntdll
 
 C_SRCS = powrprof.c

dlls/psapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi.dll
-IMPORTLIB = libpsapi.$(IMPLIBEXT)
+IMPORTLIB = psapi
 IMPORTS   = kernel32 ntdll
 
 C_SRCS = \

dlls/quartz/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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
 

dlls/rasapi32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32.dll
-IMPORTLIB = librasapi32.$(IMPLIBEXT)
+IMPORTLIB = rasapi32
 IMPORTS   = kernel32
 
 C_SRCS = rasapi.c

dlls/resutils/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = resutils.dll
-IMPORTLIB = libresutils.$(IMPLIBEXT)
+IMPORTLIB = resutils
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/riched20/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched20.dll
-IMPORTLIB = libriched20.$(IMPLIBEXT)
+IMPORTLIB = riched20
 IMPORTS   = ole32 imm32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
 

dlls/rpcrt4/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4.dll
-IMPORTLIB = librpcrt4.$(IMPLIBEXT)
+IMPORTLIB = rpcrt4
 IMPORTS   = iphlpapi advapi32 kernel32 ntdll
 DELAYIMPORTS = secur32 user32
 EXTRALIBS = -luuid

dlls/rsaenh/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rsaenh.dll
-IMPORTLIB = librsaenh.$(IMPLIBEXT)
+IMPORTLIB = rsaenh
 IMPORTS   = crypt32 advapi32 kernel32
 
 C_SRCS = \

dlls/secur32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = secur32.dll
-IMPORTLIB = libsecur32.$(IMPLIBEXT)
+IMPORTLIB = secur32
 IMPORTS   = netapi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = crypt32
 

dlls/sensapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sensapi.dll
-IMPORTLIB = libsensapi.$(IMPLIBEXT)
+IMPORTLIB = sensapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/serialui/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui.dll
-IMPORTLIB = libserialui.$(IMPLIBEXT)
+IMPORTLIB = serialui
 IMPORTS   = user32 advapi32 kernel32
 
 C_SRCS = \

dlls/setupapi/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = setupapi.dll
-IMPORTLIB = libsetupapi.$(IMPLIBEXT)
+IMPORTLIB = setupapi
 IMPORTS   = user32 version advapi32 rpcrt4 kernel32 ntdll
 DELAYIMPORTS = shell32
 EXTRALIBS = -luuid

dlls/sfc/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sfc.dll
-IMPORTLIB = libsfc.$(IMPLIBEXT)
+IMPORTLIB = sfc
 IMPORTS   = sfc_os kernel32
 
 C_SRCS = sfc_main.c

dlls/sfc_os/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sfc_os.dll
-IMPORTLIB = libsfc_os.$(IMPLIBEXT)
+IMPORTLIB = sfc_os
 IMPORTS   = kernel32
 
 C_SRCS = sfc_os.c

dlls/shdocvw/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
-IMPORTLIB = libshdocvw.$(IMPLIBEXT)
+IMPORTLIB = shdocvw
 IMPORTS   = shell32 shlwapi user32 advapi32 kernel32
 DELAYIMPORTS = urlmon ole32 oleaut32
 EXTRALIBS = -luuid

dlls/shell32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 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

dlls/shfolder/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder.dll
-IMPORTLIB = libshfolder.$(IMPLIBEXT)
+IMPORTLIB = shfolder
 IMPORTS   = shell32 kernel32
 
 RC_SRCS = version.rc

dlls/shlwapi/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 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

dlls/slc/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = slc.dll
-IMPORTLIB = libslc.$(IMPLIBEXT)
+IMPORTLIB = slc
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/snmpapi/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = snmpapi.dll
-IMPORTLIB = libsnmpapi.$(IMPLIBEXT)
+IMPORTLIB = snmpapi
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/spoolss/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR   = ../..
 SRCDIR      = @srcdir@
 VPATH       = @srcdir@
 MODULE      = spoolss.dll
-IMPORTLIB   = libspoolss.$(IMPLIBEXT)
+IMPORTLIB   = spoolss
 IMPORTS     = winspool kernel32
 
 C_SRCS  = \

dlls/sti/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = sti.dll
-IMPORTLIB = libsti.$(IMPLIBEXT)
+IMPORTLIB = sti
 IMPORTS   = kernel32
 
 C_SRCS = sti_main.c

dlls/tapi32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32.dll
-IMPORTLIB = libtapi32.$(IMPLIBEXT)
+IMPORTLIB = tapi32
 IMPORTS   = advapi32 kernel32
 
 C_SRCS = \

dlls/unicows/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 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
 

dlls/url/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = url.dll
-IMPORTLIB = liburl.$(IMPLIBEXT)
+IMPORTLIB = url
 IMPORTS   = shell32 shlwapi kernel32
 
 C_SRCS = url_main.c

dlls/urlmon/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
-IMPORTLIB = liburlmon.$(IMPLIBEXT)
+IMPORTLIB = urlmon
 IMPORTS   = ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
 EXTRALIBS = -luuid
 

dlls/user32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
-IMPORTLIB = libuser32.$(IMPLIBEXT)
+IMPORTLIB = user32
 IMPORTS   = gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = imm32
 

dlls/usp10/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = usp10.dll
-IMPORTLIB = libusp10.$(IMPLIBEXT)
+IMPORTLIB = usp10
 IMPORTS   = gdi32 kernel32
 
 C_SRCS = \

dlls/uxtheme/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uxtheme.dll
-IMPORTLIB = libuxtheme.$(IMPLIBEXT)
+IMPORTLIB = uxtheme
 IMPORTS   = user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = msimg32
 

dlls/vdmdbg/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = vdmdbg.dll
-IMPORTLIB = libvdmdbg.$(IMPLIBEXT)
+IMPORTLIB = vdmdbg
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/version/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version.dll
-IMPORTLIB = libversion.$(IMPLIBEXT)
+IMPORTLIB = version
 IMPORTS   = lz32 kernel32 ntdll
 
 C_SRCS = \

dlls/wined3d/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wined3d.dll
-IMPORTLIB = libwined3d.$(IMPLIBEXT)
+IMPORTLIB = wined3d
 IMPORTS   = user32 gdi32 advapi32 kernel32
 EXTRALIBS = -luuid
 

dlls/winedos/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
-IMPORTLIB = libwinedos.$(IMPLIBEXT)
+IMPORTLIB = winedos
 IMPORTS   = user32 kernel32 ntdll
 
 SPEC_SRCS16 = wprocs.spec

dlls/wininet/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 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@

dlls/winmm/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
-IMPORTLIB = libwinmm.$(IMPLIBEXT)
+IMPORTLIB = winmm
 IMPORTS   = user32 advapi32 kernel32 ntdll
 
 C_SRCS = \

dlls/winnls32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls32.dll
-IMPORTLIB = libwinnls32.$(IMPLIBEXT)
+IMPORTLIB = winnls32
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/winscard/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winscard.dll
-IMPORTLIB = libwinscard.$(IMPLIBEXT)
+IMPORTLIB = winscard
 IMPORTS   = kernel32
 
 C_SRCS = \

dlls/winspool.drv/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
-IMPORTLIB = libwinspool.$(IMPLIBEXT)
+IMPORTLIB = winspool
 IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
@@ -22,6 +22,6 @@ libwinspool.a: $(SPEC_DEF)
 	$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
 
 clean::
-	$(RM) $(IMPORTLIB)
+	$(RM) $(IMPORTLIBFILE)
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/wintab32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintab32.dll
-IMPORTLIB = libwintab32.$(IMPLIBEXT)
+IMPORTLIB = wintab32
 IMPORTS   = user32 kernel32
 
 C_SRCS = \

dlls/wintrust/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintrust.dll
-IMPORTLIB = libwintrust.$(IMPLIBEXT)
+IMPORTLIB = wintrust
 IMPORTS   = crypt32 user32 advapi32 kernel32 ntdll
 DELAYIMPORTS = imagehlp
 

dlls/wldap32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wldap32.dll
-IMPORTLIB = libwldap32.$(IMPLIBEXT)
+IMPORTLIB = wldap32
 IMPORTS   = user32 kernel32
 EXTRALIBS = @LDAPLIBS@
 

dlls/wnaspi32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
-IMPORTLIB = libwnaspi32.$(IMPLIBEXT)
+IMPORTLIB = wnaspi32
 IMPORTS   = advapi32 kernel32
 
 C_SRCS = \

dlls/wow32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32.dll
-IMPORTLIB = libwow32.$(IMPLIBEXT)
+IMPORTLIB = wow32
 IMPORTS   = kernel32
 
 C_SRCS = wow_main.c

dlls/ws2_32/Makefile.in

@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ws2_32.dll
-IMPORTLIB = libws2_32.$(IMPLIBEXT)
+IMPORTLIB = ws2_32
 IMPORTS   = iphlpapi kernel32 ntdll
 DELAYIMPORTS = user32
 EXTRALIBS = @LIBPOLL@

dlls/wsock32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wsock32.dll
-IMPORTLIB = libwsock32.$(IMPLIBEXT)
+IMPORTLIB = wsock32
 IMPORTS   = mswsock ws2_32 iphlpapi kernel32
 
 C_SRCS = \

dlls/wtsapi32/Makefile.in

@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wtsapi32.dll
-IMPORTLIB = libwtsapi32.$(IMPLIBEXT)
+IMPORTLIB = wtsapi32
 IMPORTS   = kernel32
 
 C_SRCS = \

tools/make_makefiles

@@ -405,7 +405,7 @@ sub update_dlls(@)
 
         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 @@ sub update_dlls(@)
     {
         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 @@ sub update_dlls(@)
     }
     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 @@ sub update_dlls(@)
         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 @@ sub update_dlls(@)
 
     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 @@ sub update_dlls(@)
     }
     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;