Take advantage of the new winegcc -B support.

dlls/Maketest.rules.in

@@ -36,7 +36,7 @@ all: $(TESTPROGRAM)
 # Rules for .so main module
 
 $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) $(IMPORTLIBS) Makefile.in
-	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) -L$(DLLDIR) -L$(LIBDIR) $(ALL_LIBS)
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) -L$(DLLDIR) -L$(LIBDIR) $(ALL_LIBS)
 
 # Rules for .exe main module
 

programs/Makeprog.rules.in

@@ -24,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
 # Rules for .so main module
 
 $(MODULE).so: $(ALL_OBJS) $(RC_SRCS:.rc=.res) Makefile.in
-	WINEBUILD=$(WINEBUILD) $(WINEGCC) $(APPMODE) $(ALL_OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(ALL_OBJS) $(RC_SRCS:.rc=.res) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS)
 
 $(BASEMODULE): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@

programs/avitools/Makefile.in

@@ -18,13 +18,13 @@ C_SRCS = \
 all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:.exe=$(EXEEXT))
 
 aviinfo.exe.so: aviinfo.o
-	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 $(ALL_LIBS) -lc
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviinfo.o -L$(DLLDIR) -lavifil32 -lkernel32 $(ALL_LIBS)
 
 aviplay.exe.so: aviplay.o
-	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw $(ALL_LIBS) -lc
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ aviplay.o -L$(DLLDIR) -lavifil32 -lddraw -lkernel32 $(ALL_LIBS)
 
 icinfo.exe.so: icinfo.o
-	WINEBUILD=$(WINEBUILD) $(WINEGCC) -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 $(ALL_LIBS) -lc
+	$(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mwindows -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS)
 
 aviinfo.exe: aviinfo.o
 	$(CC) -o $@ aviinfo.o -lavifil32 $(ALL_LIBS)

programs/clock/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = clock.exe
 APPMODE   = -mwindows
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
 
 LICENSELANG = En
 

programs/cmdlgtst/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmdlgtst.exe
 APPMODE   = -mwindows
+IMPORTS   = comdlg32 user32 gdi32 kernel32
 
 C_SRCS = \
 	cmdlgtst.c

programs/control/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = control.exe
 APPMODE   = -mwindows
+IMPORTS   = shell32 user32 kernel32
 
 C_SRCS = control.c
 

programs/expand/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = expand.exe
 APPMODE   = -mconsole
-IMPORTS   = lz32
+IMPORTS   = lz32 kernel32
 
 C_SRCS = expand.c
 

programs/notepad/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
 APPMODE   = -mwindows
-IMPORTS   = msvcrt
+IMPORTS   = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT
 

programs/progman/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = progman.exe
 APPMODE   = -mwindows
+IMPORTS   = shell32 comdlg32 user32 gdi32 kernel32
 
 LICENSELANG = En
 

programs/regedit/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regedit.exe
 APPMODE   = -mwindows
-IMPORTS   = msvcrt
+IMPORTS   = msvcrt advapi32 kernel32
 DELAYIMPORTS = shell32 comdlg32 comctl32 user32 gdi32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 EXTRADEFS = -DNO_LIBWINE_PORT

programs/regsvr32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = regsvr32.exe
 APPMODE   = -mconsole
+IMPORTS   = kernel32
 
 C_SRCS = \
 	regsvr32.c

programs/rpcss/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rpcss.exe
 APPMODE   = -mconsole
+IMPORTS   = kernel32
 
 C_SRCS = \
        epmap_server.c \

programs/rundll32/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rundll32.exe
 APPMODE   = -mconsole
+IMPORTS   = user32 kernel32
 
 C_SRCS = \
 	rundll32.c

programs/start/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = start.exe
 APPMODE   = -mconsole
-IMPORTS   = shell32
+IMPORTS   = shell32 user32 kernel32
 
 C_SRCS = start.c
 

programs/uninstaller/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = uninstaller.exe
 APPMODE   = -mconsole
-IMPORTS   = gdi32
+IMPORTS   = user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
 	main.c

programs/view/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = view.exe
 APPMODE   = -mwindows
+IMPORTS   = comdlg32 user32 gdi32 kernel32
 
 C_SRCS = \
 	init.c \

programs/wcmd/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wcmd.exe
 APPMODE   = -mconsole
-IMPORTS   = shell32
+IMPORTS   = shell32 user32 kernel32
 
 C_SRCS = \
 	batch.c \

programs/wineboot/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineboot.exe
 APPMODE   = -mconsole
+IMPORTS   = advapi32 kernel32
 
 C_SRCS = \
 	wineboot.c

programs/winebrowser/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winebrowser.exe
 APPMODE   = -mconsole
-IMPORTS   = shell32
+IMPORTS   = shell32 user32 advapi32 kernel32
 
 C_SRCS = \
 	main.c

programs/winecfg/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winecfg.exe
 APPMODE   = -mwindows
-IMPORTS   = comctl32
+IMPORTS   = comdlg32 comctl32 user32 advapi32
 
 C_SRCS = \
 	appdefaults.c \

programs/wineconsole/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineconsole.exe
 APPMODE   = -mwindows
-IMPORTS   = ntdll
+IMPORTS   = advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32 user32 gdi32
 
 C_SRCS = \

programs/winedbg/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedbg.exe
 APPMODE   = -mconsole
-IMPORTS   = ntdll
+IMPORTS   = advapi32 kernel32 ntdll
 DELAYIMPORTS = user32
 
 C_SRCS = \

programs/winefile/Makefile.in

@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = -mwindows
-IMPORTS   = comctl32 ole32
+IMPORTS   = shell32 comctl32 ole32 user32 gdi32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \

programs/winemenubuilder/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemenubuilder.exe
 APPMODE   = -mwindows
-IMPORTS   = ole32
+IMPORTS   = shell32 ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
 
 C_SRCS = \

programs/winemine/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winemine.exe
 APPMODE   = -mwindows
+IMPORTS   = user32 gdi32 advapi32 kernel32
 
 C_SRCS = \
         dialog.c \

programs/winepath/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winepath.exe
 APPMODE   = -mconsole
+IMPORTS   = kernel32
 
 C_SRCS = winepath.c
 

programs/winetest/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest.exe
 APPMODE   = -mwindows
-IMPORTS   = comctl32 wsock32
+IMPORTS   = comctl32 user32 wsock32
 
 C_SRCS = \
 	gui.c \

programs/winevdm/Makefile.in

@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winevdm.exe
 APPMODE   = -mconsole
-IMPORTS   = winedos
+IMPORTS   = winedos kernel32
 
 C_SRCS = \
 	winevdm.c

programs/winhelp/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winhelp.exe
 APPMODE   = -mwindows
+IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
 PROGRAMS  = hlp2sgml
 
 C_SRCS = \

programs/winver/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winver.exe
 APPMODE   = -mwindows
+IMPORTS   = shell32 kernel32
 
 C_SRCS = winver.c