Build most programs as .so files.

programs/avitools/Makefile.in

-DEFS      = -DWINELIB
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = icinfo aviinfo aviplay
-IMPORTS   = msvfw32 winmm ddraw x11drv user32 gdi32 kernel32 ntdll
+DEFS       = @DLLFLAGS@
+LDDLLFLAGS = @LDDLLFLAGS@
+TOPSRCDIR  = @top_srcdir@
+TOPOBJDIR  = ../..
+SRCDIR     = @srcdir@
+VPATH      = @srcdir@
+MODULE     = none
+PROGRAMS   = icinfo aviinfo aviplay
+ALL_LIBS   = -L$(TOPOBJDIR) -lwine $(LIBS)
 
 SPEC_SRCS = \
 	icinfo.spec \
@@ -16,21 +17,47 @@ all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-icinfo: icinfo.o icinfo.spec.o
-	$(CC) -o icinfo icinfo.o icinfo.spec.o $(DLL_LINK) $(LIBS)
+aviinfo.spec.c: aviinfo.spec aviinfo.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym aviinfo.o -o aviinfo.spec.c -spec aviinfo.spec
 
-aviinfo: aviinfo.o aviinfo.spec.o
-	$(CC) -o aviinfo aviinfo.o aviinfo.spec.o $(DLL_LINK) $(LIBS)
+aviplay.spec.c: aviplay.spec aviplay.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym aviplay.o -o aviplay.spec.c -spec aviplay.spec
 
-aviplay: aviplay.o aviplay.spec.o
-	$(CC) -o aviplay aviplay.o aviplay.spec.o $(DLL_LINK) $(LIBS)
+icinfo.spec.c: icinfo.spec icinfo.o $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -sym icinfo.o -o icinfo.spec.c -spec icinfo.spec
 
-install::
-	$(INSTALL_PROGRAM) icinfo $(bindir)/icinfo
-	$(INSTALL_PROGRAM) aviinfo $(bindir)/aviinfo
-	$(INSTALL_PROGRAM) aviplay $(bindir)/aviplay
+aviinfo.so: aviinfo.o aviinfo.spec.o
+	$(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS)
+
+aviplay.so: aviplay.o aviplay.spec.o
+	$(LDSHARED) $(LDDLLFLAGS) -o aviplay.so aviplay.o aviplay.spec.o $(ALL_LIBS)
+
+icinfo.so: icinfo.o icinfo.spec.o
+	$(LDSHARED) $(LDDLLFLAGS) -o icinfo.so icinfo.o icinfo.spec.o $(ALL_LIBS)
+
+aviinfo: aviinfo.so
+	$(RM) aviinfo && $(LN_S) $(TOPOBJDIR)/wine aviinfo
+
+aviplay: aviplay.so
+	$(RM) aviplay && $(LN_S) $(TOPOBJDIR)/wine aviplay
+
+icinfo: icinfo.so
+	$(RM) icinfo && $(LN_S) $(TOPOBJDIR)/wine icinfo
+
+install:: $(PROGRAMS:%=%.so)
+	[ -d $(bindir) ] || $(MKDIR) $(bindir)
+	$(INSTALL_PROGRAM) aviinfo.so $(bindir)/aviinfo.so
+	$(INSTALL_PROGRAM) aviplay.so $(bindir)/aviplay.so
+	$(INSTALL_PROGRAM) icinfo.so $(bindir)/icinfo.so
+	cd $(bindir) && $(LN_S) wine aviinfo && $(LN_S) wine aviplay && $(LN_S) wine icinfo
 
 uninstall::
-	$(RM) $(bindir)/aviinfo $(bindir)/icinfo $(bindir)/aviplay
+	$(RM) $(bindir)/aviinfo.so $(bindir)/aviplay.so $(bindir)/icinfo.so
+	$(RM) $(bindir)/aviinfo $(bindir)/aviplay $(bindir)/icinfo
+
+checklink:: $(PROGRAMS:%=%.so)
+	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.so $(ALL_LIBS) && $(RM) checklink
+	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.so $(ALL_LIBS) && $(RM) checklink
+	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.so $(ALL_LIBS) && $(RM) checklink
 
 ### Dependencies:

programs/avitools/aviinfo.spec

 name	aviinfo
 mode	guiexe
 type	win32
-init	WinMain
+
+import	kernel32.dll
+import	ntdll.dll

programs/avitools/aviplay.spec

 name	aviplay
 mode	guiexe
 type	win32
-init	WinMain
+
+import	ddraw.dll
+import	kernel32.dll
+import	ntdll.dll

programs/avitools/icinfo.spec

 name	icinfo
 mode	guiexe
 type	win32
-init	WinMain
+
+import	msvfw32.dll
+import	kernel32.dll
+import	ntdll.dll

programs/clock/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = clock
-IMPORTS   = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
+MODULE    = clock
 
 LICENSELANG = En
 
 C_SRCS = \
 	language.c \
 	license.c \
-	winclock.c \
 	main.c \
+	winclock.c \
 	$(LICENSELANG:%=License_%.c)
 
-SPEC_SRCS = clock.spec
-
 RC_SRCS = rsrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-clock: $(OBJS)
-	$(CC) -o clock $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) clock $(bindir)/clock
-
-uninstall::
-	$(RM) $(bindir)/clock
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/cmdlgtst/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = cmdlgtst
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
+MODULE    = cmdlgtst
 
 C_SRCS = \
 	cmdlgtst.c
 
-SPEC_SRCS = \
-	cmdlgtst.spec
-
 RC_SRCS = \
 	cmdlgr.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-cmdlgtst: $(OBJS)
-	$(CC) -o cmdlgtst $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst
-
-uninstall::
-	$(RM) $(bindir)/cmdlgtst
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/control/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = control
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
+MODULE    = control
 
 C_SRCS = control.c
 
-SPEC_SRCS = control.spec
-
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-control: $(OBJS)
-	$(CC) -o control $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) control $(bindir)/control
-
-uninstall::
-	$(RM) $(bindir)/control
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/notepad/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = notepad
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
+MODULE    = notepad
 
 LICENSELANG = En
 
 C_SRCS = \
-	license.c \
-	main.c \
 	dialog.c \
 	language.c \
+	license.c \
+	main.c \
 	search.c \
 	$(LICENSELANG:%=License_%.c)
 
-SPEC_SRCS = notepad.spec
-
 RC_SRCS = rsrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-notepad: $(OBJS)
-	$(CC) -o notepad $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) notepad $(bindir)/notepad
-
-uninstall::
-	$(RM) $(bindir)/notepad
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/osversioncheck/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = osversioncheck
-IMPORTS   = kernel32 ntdll
+MODULE    = osversioncheck
 
 C_SRCS = osversioncheck.c
 
-SPEC_SRCS = osversioncheck.spec
-
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-osversioncheck: $(OBJS)
-	$(CC) -o osversioncheck $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) osversioncheck $(bindir)/osversioncheck
-
-uninstall::
-	$(RM) $(bindir)/osversioncheck
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/progman/Makefile.in

@@ -38,4 +38,6 @@ install::
 uninstall::
 	$(RM) $(bindir)/progman
 
+checklink::
+
 ### Dependencies:

programs/regapi/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = regapi
-IMPORTS   = kernel32 ntdll
+MODULE    = regapi
 
 C_SRCS = \
 	regapi.c
 
-SPEC_SRCS = \
-	regapi.spec
-
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-regapi: $(OBJS)
-	$(CC) -o regapi $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) regapi $(bindir)/regapi
-
-uninstall::
-	$(RM) $(bindir)/regapi
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/regtest/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = regtest
-IMPORTS   = kernel32 ntdll
+MODULE    = regtest
 
 C_SRCS = regtest.c
 
-SPEC_SRCS = regtest.spec
-
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-regtest: $(OBJS)
-	$(CC) -o regtest $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) regtest $(bindir)/regtest
-
-uninstall::
-	$(RM) $(bindir)/regtest
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/uninstaller/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = uninstaller
-IMPORTS   = user32 gdi32 kernel32 ntdll
-
-LICENSELANG = En
+MODULE    = uninstaller
 
 C_SRCS = \
 	main.c
 
-SPEC_SRCS = uninstaller.spec
-
 RC_SRCS = rsrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-uninstaller: $(OBJS)
-	$(CC) -o uninstaller $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) uninstaller $(bindir)/uninstaller
-
-uninstall::
-	$(RM) $(bindir)/uninstaller
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/view/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = view
-IMPORTS   = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 ntdll
+MODULE    = view
 
 C_SRCS = \
 	init.c \
 	view.c \
 	winmain.c
 
-SPEC_SRCS = \
-	view.spec
-
 RC_SRCS = \
 	viewrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-view: $(OBJS)
-	$(CC) -o view $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) view $(bindir)/view
-
-uninstall::
-	$(RM) $(bindir)/view
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/wcmd/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = wcmd
-IMPORTS   = shell32 user32 gdi32 kernel32 ntdll
+MODULE    = wcmd
 
 C_SRCS = \
 	batch.c \
@@ -13,25 +11,9 @@ C_SRCS = \
 	directory.c \
 	wcmdmain.c
 
-SPEC_SRCS = \
-	wcmd.spec
-
 RC_SRCS = \
 	wcmdrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-wcmd: $(OBJS)
-	$(CC) -o wcmd $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) wcmd $(bindir)/wcmd
-
-uninstall::
-	$(RM) $(bindir)/wcmd
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/winemine/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = winemine
-IMPORTS   = user32 gdi32 kernel32 ntdll
-
-LICENSELANG = En
+MODULE    = winemine
 
 C_SRCS = \
-	main.c \
-        dialog.c
-
-SPEC_SRCS = winemine.spec
+        dialog.c \
+	main.c
 
 RC_SRCS = rsrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-winemine: $(OBJS)
-	$(CC) -o winemine $(OBJS) $(DLL_LINK) $(LIBS)
-
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-install::
-	$(INSTALL_PROGRAM) winemine $(bindir)/winemine
-
-uninstall::
-	$(RM) $(bindir)/winemine
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/winhelp/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DWINELIB -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = winhelp hlp2sgml
+MODULE    = winhelp
+PROGRAMS  = hlp2sgml
 IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
@@ -13,31 +13,23 @@ C_SRCS = \
 	macro.c \
 	string.c
 
-SPEC_SRCS = winhelp.spec
-
 EXTRA_SRCS = macro.yacc.y macro.lex.l
 EXTRA_OBJS = y.tab.o lex.yy.o
 
 RC_SRCS = rsrc.rc
 
-all: $(PROGRAMS)
-
-@MAKE_RULES@
+@MAKE_PROG_RULES@
 
-$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
-
-winhelp: $(OBJS)
-	$(CC) -o winhelp $(OBJS) $(DLL_LINK) $(LIBS)
+all: $(PROGRAMS)
 
 hlp2sgml: hlp2sgml.o hlpfile.o
 	$(CC) -o hlp2sgml hlp2sgml.o hlpfile.o
 
 install::
-	$(INSTALL_PROGRAM) winhelp $(bindir)/winhelp
 	$(INSTALL_PROGRAM) hlp2sgml $(bindir)/hlp2sgml
 
 uninstall::
-	$(RM) $(bindir)/winhelp $(bindir)/hlp2sgml
+	$(RM) $(bindir)/hlp2sgml
 
 y.tab.c y.tab.h: macro.yacc.y
 	$(YACC) -d -t $(SRCDIR)/macro.yacc.y

programs/winver/Makefile.in

-DEFS      = -DWINELIB -DSTRICT
+EXTRADEFS = -DSTRICT
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
-PROGRAMS  = winver
-IMPORTS   = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 user32 gdi32 kernel32 ntdll
+MODULE    = winver
 
 C_SRCS = winver.c
 
-SPEC_SRCS = winver.spec
-
-all: $(PROGRAMS)
-
-@MAKE_RULES@
-
-winver: $(OBJS)
-	$(CC) -o winver $(OBJS) $(DLL_LINK) $(LIBS)
-
-install::
-	$(INSTALL_PROGRAM) winver $(bindir)/winver
-
-uninstall::
-	$(RM) $(bindir)/winver
+@MAKE_PROG_RULES@
 
 ### Dependencies:

programs/winver/winver.spec

@@ -3,6 +3,5 @@ mode	guiexe
 type	win32
 
 import	shell32.dll
-import	user32.dll
 import	kernel32.dll
 import	ntdll.dll