From e1d78899ea2be0f9af5473c5c21e146bad99dc6b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 26 Feb 2000 13:45:34 +0000 Subject: [PATCH] Made winmm a separate shared library. --- Make.rules.in | 1 + Makefile.in | 2 -- dlls/Makefile.in | 5 +++++ dlls/avifil32/Makefile.in | 2 +- dlls/comctl32/Makefile.in | 1 + dlls/commdlg/Makefile.in | 2 +- dlls/msvideo/Makefile.in | 1 + dlls/oleaut32/Makefile.in | 2 +- dlls/shell32/Makefile.in | 2 +- dlls/winmm/.cvsignore | 5 +++-- dlls/winmm/Makefile.in | 7 ++++++- dlls/winmm/joystick/Makefile.in | 1 + dlls/winmm/mcianim/Makefile.in | 1 + dlls/winmm/mciavi/Makefile.in | 1 + dlls/winmm/mcicda/Makefile.in | 1 + dlls/winmm/mciseq/Makefile.in | 1 + dlls/winmm/mciwave/Makefile.in | 1 + dlls/winmm/midimap/Makefile.in | 1 + dlls/winmm/wavemap/Makefile.in | 1 + dlls/winmm/wineoss/Makefile.in | 1 + include/acconfig.h | 3 +++ include/config.h.in | 2 +- 22 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index e2ecbdfcc6f..76189622fca 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -126,6 +126,7 @@ DLLS = \ windebug \ wineoss.drv \ wing \ + winmm \ winspool \ wnaspi32 \ wsock32 diff --git a/Makefile.in b/Makefile.in index f27dff298a0..6fac5bec2e8 100644 --- a/Makefile.in +++ b/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 \ diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 3c689040140..45c4079eeb1 100644 --- a/dlls/Makefile.in +++ b/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@ $@ diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index e67d9af5b55..916b0bb3a61 100644 --- a/dlls/avifil32/Makefile.in +++ b/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 diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index e84f84f35e9..664089d980e 100644 --- a/dlls/comctl32/Makefile.in +++ b/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 diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in index a98c279b14b..8d912f5fbba 100644 --- a/dlls/commdlg/Makefile.in +++ b/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 diff --git a/dlls/msvideo/Makefile.in b/dlls/msvideo/Makefile.in index e668e2a37cc..9aa1e1d2828 100644 --- a/dlls/msvideo/Makefile.in +++ b/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 diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index ae96750ea4d..9cf29a4e2cd 100644 --- a/dlls/oleaut32/Makefile.in +++ b/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 diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index fe98fcc8cc8..29c6d0bdc79 100644 --- a/dlls/shell32/Makefile.in +++ b/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 = \ diff --git a/dlls/winmm/.cvsignore b/dlls/winmm/.cvsignore index c20e2ff7ead..9231b6a655d 100644 --- a/dlls/winmm/.cvsignore +++ b/dlls/winmm/.cvsignore @@ -1,5 +1,6 @@ -Makefile +*.glue.c *.spec.c *.spec.glue.s -*.glue.c +Makefile +libwinmm.so.1.0 winmm_res.s diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index a02e07612b3..bb502bf6030 100644 --- a/dlls/winmm/Makefile.in +++ b/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: diff --git a/dlls/winmm/joystick/Makefile.in b/dlls/winmm/joystick/Makefile.in index d21e08f70e3..028d2d37ad8 100644 --- a/dlls/winmm/joystick/Makefile.in +++ b/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 diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in index 69f17e65db0..d54653a3bd3 100644 --- a/dlls/winmm/mcianim/Makefile.in +++ b/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 diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in index ee31b734e77..1a485172bfa 100644 --- a/dlls/winmm/mciavi/Makefile.in +++ b/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 diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in index edc778c2e70..da823f641bb 100644 --- a/dlls/winmm/mcicda/Makefile.in +++ b/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 diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in index 1c16515f5e9..e4136b7869b 100644 --- a/dlls/winmm/mciseq/Makefile.in +++ b/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 diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in index 87d1c6b5285..26e6f69785c 100644 --- a/dlls/winmm/mciwave/Makefile.in +++ b/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 diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in index b774fb807b6..b50fe282947 100644 --- a/dlls/winmm/midimap/Makefile.in +++ b/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 diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in index c854fec4d3e..6b4b323ce45 100644 --- a/dlls/winmm/wavemap/Makefile.in +++ b/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 diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index e7c58232df8..bb1f5e71e72 100644 --- a/dlls/winmm/wineoss/Makefile.in +++ b/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 diff --git a/include/acconfig.h b/include/acconfig.h index 6f3bcb219fa..87ba6c6940c 100644 --- a/include/acconfig.h +++ b/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 diff --git a/include/config.h.in b/include/config.h.in index b2d3ed62272..d94db3cd717 100644 --- a/include/config.h.in +++ b/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). */ -- 2.11.4.GIT