Made winmm a separate shared library.

Make.rules.in

@@ -126,6 +126,7 @@ DLLS = \
 	windebug \
 	wineoss.drv \
 	wing \
+	winmm \
 	winspool \
 	wnaspi32 \
 	wsock32

Makefile.in

@@ -35,7 +35,6 @@ LIBSUBDIRS = \
 	dlls/mpr \
 	dlls/ntdll \
 	dlls/winaspi \
-	dlls/winmm \
 	files \
 	graphics \
 	graphics/enhmetafiledrv \
@@ -113,7 +112,6 @@ LIBOBJS = \
 	dlls/mpr/mpr.o \
 	dlls/ntdll/ntdll.o \
 	dlls/winaspi/winaspi.o \
-	dlls/winmm/winmm.o \
 	files/files.o \
 	graphics/graphics.o \
 	graphics/enhmetafiledrv/enhmetafiledrv.o \

dlls/Makefile.in

@@ -37,6 +37,7 @@ DLLFILES = \
 	win87em/libwin87em.@LIBEXT@ \
 	windebug/libwindebug.@LIBEXT@ \
 	wing/libwing.@LIBEXT@ \
+	winmm/libwinmm.@LIBEXT@ \
 	winmm/joystick/libjoystick.drv.@LIBEXT@ \
 	winmm/mcianim/libmcianim.drv.@LIBEXT@ \
 	winmm/mciavi/libmciavi.drv.@LIBEXT@ \
@@ -226,6 +227,10 @@ libwing.@LIBEXT@: wing/libwing.@LIBEXT@
 	$(RM) $@
 	$(LN_S) wing/libwing.@LIBEXT@ $@
 
+libwinmm.@LIBEXT@: winmm/libwinmm.@LIBEXT@
+	$(RM) $@
+	$(LN_S) winmm/libwinmm.@LIBEXT@ $@
+
 libwinspool.@LIBEXT@: winspool/libwinspool.@LIBEXT@
 	$(RM) $@
 	$(LN_S) winspool/libwinspool.@LIBEXT@ $@

dlls/avifil32/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = avifil32
 SOVERSION = 1.0
-IMPORTS   = msvfw32
+IMPORTS   = msvfw32 winmm
 
 SPEC_SRCS = avifil32.spec avifile.spec
 

dlls/comctl32/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = comctl32
 SOVERSION = 1.0
+IMPORTS   = winmm
 WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = comctl32.spec

dlls/commdlg/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = comdlg32
 SOVERSION = 1.0
-IMPORTS   = shell32 ole32 comctl32 winspool
+IMPORTS   = shell32 ole32 comctl32 winspool winmm
 WRCEXTRA  = -s -pcomdlg32
 
 SPEC_SRCS = commdlg.spec comdlg32.spec

dlls/msvideo/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = msvfw32
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = msvfw32.spec msvideo.spec
 

dlls/oleaut32/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = oleaut32
 SOVERSION = 1.0
-IMPORTS   = olepro32 ole32 comctl32
+IMPORTS   = olepro32 ole32 comctl32 winmm
 
 SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec
 

dlls/shell32/Makefile.in

@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = shell32
 SOVERSION = 1.0
-IMPORTS   = ole32 comctl32
+IMPORTS   = ole32 comctl32 winmm
 WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = \

dlls/winmm/.cvsignore

-Makefile
+*.glue.c
 *.spec.c
 *.spec.glue.s
-*.glue.c
+Makefile
+libwinmm.so.1.0
 winmm_res.s

dlls/winmm/Makefile.in

@@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
+LIBEXT    = @LIBEXT@
 MODULE    = winmm
+SOVERSION = 1.0
 WRCEXTRA  = -s -pwinmm
 
 SPEC_SRCS = \
@@ -25,7 +27,7 @@ GLUE =  lolvldrv.c \
 RC_SRCS= \
 	winmm_res.rc
 
-all: check_wrc $ $(MODULE).o
+all: check_wrc $ lib$(MODULE).$(LIBEXT)
 
 SUBDIRS = \
 	joystick \
@@ -45,4 +47,7 @@ $(SUBDIRS): dummy
 
 $(RC_SRCS:.rc=.s): $(WRC)
 
+clean::
+	$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
+
 ### Dependencies:

dlls/winmm/joystick/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = joystick.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	joystick.spec

dlls/winmm/mcianim/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = mcianim.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	mcianim.spec

dlls/winmm/mciavi/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = mciavi.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	mciavi.spec

dlls/winmm/mcicda/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = mcicda.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	mcicda.spec

dlls/winmm/mciseq/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = mciseq.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	mciseq.spec

dlls/winmm/mciwave/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = mciwave.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	mciwave.spec

dlls/winmm/midimap/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = midimap.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	midimap.spec

dlls/winmm/wavemap/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = msacm.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	msacm.spec

dlls/winmm/wineoss/Makefile.in

@@ -6,6 +6,7 @@ VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = wineoss.drv
 SOVERSION = 1.0
+IMPORTS   = winmm
 
 SPEC_SRCS = \
 	wineoss.spec

include/acconfig.h

@@ -12,6 +12,9 @@
 /* Define if struct msghdr contains msg_accrights */
 #undef HAVE_MSGHDR_ACCRIGHTS
 
+/* Define if struct sockaddr_un contains sun_len */
+#undef HAVE_SOCKADDR_SUN_LEN
+
 /* Define if you have the Xxf86dga library (-lXxf86dga).  */
 #undef HAVE_LIBXXF86DGA
 

include/config.h.in

@@ -53,7 +53,7 @@
 /* Define if struct msghdr contains msg_accrights */
 #undef HAVE_MSGHDR_ACCRIGHTS
 
-/* Define if struct sockaddr_un has the member sun_len */
+/* Define if struct sockaddr_un contains sun_len */
 #undef HAVE_SOCKADDR_SUN_LEN
 
 /* Define if you have the Xxf86dga library (-lXxf86dga).  */