Start using import tables for dlls that can already support it.

dlls/Makefile.in

@@ -418,13 +418,13 @@ opengl32/libopengl32.so: libx11drv.so libkernel32.so
 psapi/libpsapi.so: libkernel32.so libntdll.so
 rasapi32/librasapi32.so: libntdll.so
 richedit/libriched32.so: libuser32.so libkernel32.so libntdll.so
-rpcrt4/librpcrt4.so: libntdll.so
+rpcrt4/librpcrt4.so: libkernel32.so libntdll.so
 serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so libntdll.so
 setupapi/libsetupapi.so: libadvapi32.so libkernel32.so libntdll.so
 shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
-shfolder/libshfolder.so: libshell32.so libntdll.so
+shfolder/libshfolder.so: libshell32.so
 shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libgdi32.so libkernel32.so libntdll.so
-tapi32/libtapi32.so: libkernel32.so
+tapi32/libtapi32.so: libkernel32.so libntdll.so
 ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so libntdll.so
 urlmon/liburlmon.so: libole32.so libntdll.so
 user/libuser32.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
@@ -445,7 +445,7 @@ winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.
 winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so libntdll.so
 winsock/libws2_32.so: libuser32.so libkernel32.so libntdll.so
 winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so libntdll.so
-wow32/libwow32.so: libkernel32.so libntdll.so
+wow32/libwow32.so: libkernel32.so
 wsock32/libwsock32.so: libws2_32.so libkernel32.so libntdll.so
 x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
 

dlls/avifil32/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32
-SOVERSION = 1.0
 ALTNAMES  = avifile
-IMPORTS   = msvfw32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	avifile.c

dlls/comctl32/Makefile.in

@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comctl32
-SOVERSION = 1.0
+EXTRALIBS = -lwine_unicode
 IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	animate.c \
 	comboex.c \

dlls/commdlg/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32
-SOVERSION = 1.0
 ALTNAMES  = commdlg
-IMPORTS   = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32 ntdll
+IMPORTS   = user32 gdi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	cdlg32.c \

dlls/commdlg/filedlgbrowser.c

@@ -6,20 +6,19 @@
 
 #include <stdio.h>
 
-#include "filedlgbrowser.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "unknwn.h"
 #include "wine/winestring.h"
 #include "heap.h"
-#include "shlguid.h"
-#include "wine/obj_dataobject.h"
 #include "debugtools.h"
-#include "cdlg.h"
 
 #define INITGUID
 #include "initguid.h"
+#include "unknwn.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "shlguid.h"
 #include "wine/obj_serviceprovider.h"
 
 DEFAULT_DEBUG_CHANNEL(commdlg);

dlls/crtdll/Makefile.in

@@ -3,8 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = crtdll
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	crtdll_main.c \

dlls/dciman32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dciman32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = dciman_main.c
 

dlls/dplay/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplay
-SOVERSION = 1.0
-IMPORTS   = dplayx
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = dplay_main.c
 

dlls/dplayx/Makefile.in

@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dplayx
-SOVERSION = 1.0
-IMPORTS   = winmm ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	dpclassfactory.c \

dlls/dsound/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = dsound
-SOVERSION = 1.0
-IMPORTS   = winmm kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	dsound_main.c

dlls/icmp/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = icmp
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = icmp_main.c 
 

dlls/imagehlp/Makefile.in

@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imagehlp
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	access.c \

dlls/imm32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	imm.c

dlls/lzexpand/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32
-SOVERSION = 1.0
 ALTNAMES  = lzexpand
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	lzexpand_main.c

dlls/mpr/Makefile.in

@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mpr
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	auth.c \

dlls/msacm/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32
-SOVERSION = 1.0
 ALTNAMES  = msacm
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	driver.c \

dlls/msnet32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msnet32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = msnet_main.c
 

dlls/msvideo/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32
-SOVERSION = 1.0
 ALTNAMES  = msvideo
-IMPORTS   = winmm user32 gdi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	msvideo_main.c \

dlls/odbc32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = odbc32
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	proxyodbc.c 

dlls/oleaut32/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32
-SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
-IMPORTS   = ole32 user32 gdi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	connpt.c \

dlls/olecli/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32
-SOVERSION = 1.0
 ALTNAMES  = olecli
-IMPORTS   = ole32 olesvr32 gdi32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	olecli_main.c

dlls/oledlg/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	oledlg_main.c

dlls/olepro32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olepro32
-SOVERSION = 1.0
-IMPORTS   = oleaut32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = olepro32stubs.c
 

dlls/olesvr/Makefile.in

@@ -3,10 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32
-SOVERSION = 1.0
 ALTNAMES  = olesvr
 IMPORTS   = ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	olesvr_main.c
 

dlls/psapi/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = psapi
-SOVERSION = 1.0
-IMPORTS   = kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	psapi_main.c

dlls/rasapi32/Makefile.in

@@ -3,10 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32
-SOVERSION = 1.0
 ALTNAMES  = rasapi16
 IMPORTS   = ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = rasapi.c 
 
 @MAKE_DLL_RULES@

dlls/richedit/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
-SOVERSION = 1.0
-IMPORTS   = user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	charlist.c \

dlls/rpcrt4/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcrt4
-SOVERSION = 1.0
-IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	rpcrt4_main.c

dlls/rpcrt4/rpcrt4.spec

@@ -2,6 +2,7 @@ name	rpcrt4
 type	win32
 init	RPCRT4_LibMain
 
+import	kernel32.dll
 import	ntdll.dll
 
 debug_channels (ole)

dlls/serialui/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = serialui
-SOVERSION = 1.0
-IMPORTS   = user32 advapi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	confdlg.c

dlls/setupapi/Makefile.in

@@ -5,7 +5,10 @@ VPATH     = @srcdir@
 MODULE    = setupapi
 SOVERSION = 1.0
 ALTNAMES  = setupx
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	infparse.c \

dlls/shell32/Makefile.in

@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32
-SOVERSION = 1.0
 ALTNAMES  = shell
-IMPORTS   = ole32 shlwapi comctl32 advapi32 user32 gdi32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = user32 gdi32 advapi32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	brsfolder.c \

dlls/shell32/shell32.spec

@@ -272,10 +272,10 @@ debug_channels (exec pidl shell)
  322 stub StrRStrIA
  323 stub StrRStrIW
  324 stub StrRStrW
- 325 stdcall StrStrA(str str)StrStrA
- 326 stdcall StrStrIA(str str)StrStrIA
- 327 stdcall StrStrIW(wstr wstr)StrStrIW
- 328 stdcall StrStrW(wstr wstr)StrStrW
+ 325 forward StrStrA shlwapi.StrStrA
+ 326 forward StrStrIA shlwapi.StrStrIA
+ 327 forward StrStrIW shlwapi.StrStrIW
+ 328 forward StrStrW shlwapi.StrStrW
 
  505 stdcall SHRegCloseKey (long) SHRegCloseKey
  506 stdcall SHRegOpenKeyA (long str long) SHRegOpenKeyA

dlls/shfolder/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shfolder
-SOVERSION = 1.0
-IMPORTS   = shell32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = shfolder_main.c
 

dlls/shlwapi/Makefile.in

@@ -3,8 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shlwapi
-SOVERSION = 1.0
-IMPORTS   = advapi32 user32 gdi32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	ordinal.c \

dlls/tapi32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = tapi32
-SOVERSION = 1.0
-IMPORTS   = kernel32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	assisted.c \

dlls/tapi32/tapi32.spec

@@ -2,6 +2,7 @@ name	tapi32
 type	win32
 
 import	kernel32.dll
+import	ntdll.dll
 
 debug_channels (tapi)
 

dlls/ttydrv/Makefile.in

@@ -6,6 +6,9 @@ MODULE    = ttydrv
 SOVERSION = 1.0
 IMPORTS   = user32 gdi32 kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	bitmap.c \
 	dc.c \

dlls/urlmon/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon
-SOVERSION = 1.0
-IMPORTS   = ole32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	umon.c \

dlls/version/Makefile.in

@@ -3,9 +3,12 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version
-SOVERSION = 1.0
 ALTNAMES  = ver
-IMPORTS   = lz32 kernel32 ntdll
+EXTRALIBS = -lwine_unicode
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	info.c \

dlls/win32s/Makefile.in

@@ -7,6 +7,9 @@ SOVERSION = 1.0
 ALTNAMES  = w32sys win32s16
 IMPORTS   = kernel32 ntdll
 
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
+
 C_SRCS = \
 	w32skernel.c \
 	w32sys.c \

dlls/winaspi/Makefile.in

@@ -3,9 +3,11 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32
-SOVERSION = 1.0
 ALTNAMES  = winaspi
-IMPORTS   = advapi32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	aspi.c \

dlls/wininet/Makefile.in

@@ -3,8 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wininet
-SOVERSION = 1.0
-IMPORTS   = user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	ftp.c \

dlls/winmm/joystick/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = joystick.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	joystick.c

dlls/winmm/mcicda/Makefile.in

@@ -3,8 +3,10 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mcicda.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mcicda.c

dlls/winmm/mciseq/Makefile.in

@@ -4,7 +4,10 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+IMPORTS   = ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mcimidi.c

dlls/winmm/mciwave/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = mciwave.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	mciwave.c

dlls/winmm/midimap/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = midimap.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	midimap.c

dlls/winmm/wavemap/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	wavemap.c

dlls/winmm/wineoss/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineoss.drv
-SOVERSION = 1.0
-IMPORTS   = winmm user32 kernel32 ntdll
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
 	audio.c \

dlls/wow32/Makefile.in

@@ -3,8 +3,9 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wow32
-SOVERSION = 1.0
-IMPORTS   = kernel32
+
+LDDLLFLAGS = @LDDLLFLAGS@
+SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = wow_main.c