Skip to content

W
wine-winehq
Commit 37b51f4a authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Merged msacm and msacm32 dlls.

Merged win87em and windebug into kernel32.dll.
parent 56045a55
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 98 deletions
Make.rules.in
View file @ 37b51f4a
...@@ -116,7 +116,6 @@ DLLS = \ ...@@ -116,7 +116,6 @@ DLLS = \
mciwave.drv \ mciwave.drv \
midimap.drv \ midimap.drv \
mpr \ mpr \
msacm \
msacm.drv \ msacm.drv \
msacm32 \ msacm32 \
msnet32 \ msnet32 \
...@@ -146,8 +145,6 @@ DLLS = \ ...@@ -146,8 +145,6 @@ DLLS = \
user32 \ user32 \
version \ version \
w32skrnl \ w32skrnl \
win87em \
windebug \
wineoss.drv \ wineoss.drv \
wineps \ wineps \
wing \ wing \
......
configure
View file @ 37b51f4a
...@@ -6260,7 +6260,6 @@ dlls/kernel/Makefile ...@@ -6260,7 +6260,6 @@ dlls/kernel/Makefile
dlls/lzexpand/Makefile dlls/lzexpand/Makefile
dlls/mpr/Makefile dlls/mpr/Makefile
dlls/msacm/Makefile dlls/msacm/Makefile
dlls/msacm32/Makefile
dlls/msnet32/Makefile dlls/msnet32/Makefile
dlls/msvideo/Makefile dlls/msvideo/Makefile
dlls/ntdll/Makefile dlls/ntdll/Makefile
...@@ -6291,9 +6290,7 @@ dlls/urlmon/Makefile ...@@ -6291,9 +6290,7 @@ dlls/urlmon/Makefile
dlls/user/Makefile dlls/user/Makefile
dlls/version/Makefile dlls/version/Makefile
dlls/win32s/Makefile dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wineps/Makefile dlls/wineps/Makefile
dlls/wing/Makefile dlls/wing/Makefile
dlls/wininet/Makefile dlls/wininet/Makefile
...@@ -6503,7 +6500,6 @@ dlls/kernel/Makefile ...@@ -6503,7 +6500,6 @@ dlls/kernel/Makefile
dlls/lzexpand/Makefile dlls/lzexpand/Makefile
dlls/mpr/Makefile dlls/mpr/Makefile
dlls/msacm/Makefile dlls/msacm/Makefile
dlls/msacm32/Makefile
dlls/msnet32/Makefile dlls/msnet32/Makefile
dlls/msvideo/Makefile dlls/msvideo/Makefile
dlls/ntdll/Makefile dlls/ntdll/Makefile
...@@ -6534,9 +6530,7 @@ dlls/urlmon/Makefile ...@@ -6534,9 +6530,7 @@ dlls/urlmon/Makefile
dlls/user/Makefile dlls/user/Makefile
dlls/version/Makefile dlls/version/Makefile
dlls/win32s/Makefile dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wineps/Makefile dlls/wineps/Makefile
dlls/wing/Makefile dlls/wing/Makefile
dlls/wininet/Makefile dlls/wininet/Makefile
......
configure.in
View file @ 37b51f4a
...@@ -1004,7 +1004,6 @@ dlls/kernel/Makefile ...@@ -1004,7 +1004,6 @@ dlls/kernel/Makefile
dlls/lzexpand/Makefile dlls/lzexpand/Makefile
dlls/mpr/Makefile dlls/mpr/Makefile
dlls/msacm/Makefile dlls/msacm/Makefile
dlls/msacm32/Makefile
dlls/msnet32/Makefile dlls/msnet32/Makefile
dlls/msvideo/Makefile dlls/msvideo/Makefile
dlls/ntdll/Makefile dlls/ntdll/Makefile
...@@ -1035,9 +1034,7 @@ dlls/urlmon/Makefile ...@@ -1035,9 +1034,7 @@ dlls/urlmon/Makefile
dlls/user/Makefile dlls/user/Makefile
dlls/version/Makefile dlls/version/Makefile
dlls/win32s/Makefile dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wineps/Makefile dlls/wineps/Makefile
dlls/wing/Makefile dlls/wing/Makefile
dlls/wininet/Makefile dlls/wininet/Makefile
......
dlls/Makefile.in
View file @ 37b51f4a
...@@ -29,8 +29,7 @@ DLLFILES = \ ...@@ -29,8 +29,7 @@ DLLFILES = \
kernel/libkernel32.@LIBEXT@ \ kernel/libkernel32.@LIBEXT@ \
lzexpand/liblz32.@LIBEXT@ \ lzexpand/liblz32.@LIBEXT@ \
mpr/libmpr.@LIBEXT@ \ mpr/libmpr.@LIBEXT@ \
msacm/libmsacm.@LIBEXT@ \ msacm/libmsacm32.@LIBEXT@ \
msacm32/libmsacm32.@LIBEXT@ \
msnet32/libmsnet32.@LIBEXT@ \ msnet32/libmsnet32.@LIBEXT@ \
msvideo/libmsvfw32.@LIBEXT@ \ msvideo/libmsvfw32.@LIBEXT@ \
odbc32/libodbc32.@LIBEXT@ \ odbc32/libodbc32.@LIBEXT@ \
...@@ -58,9 +57,7 @@ DLLFILES = \ ...@@ -58,9 +57,7 @@ DLLFILES = \
user/libuser32.@LIBEXT@ \ user/libuser32.@LIBEXT@ \
version/libversion.@LIBEXT@ \ version/libversion.@LIBEXT@ \
win32s/libw32skrnl.@LIBEXT@ \ win32s/libw32skrnl.@LIBEXT@ \
win87em/libwin87em.@LIBEXT@ \
winaspi/libwnaspi32.@LIBEXT@ \ winaspi/libwnaspi32.@LIBEXT@ \
windebug/libwindebug.@LIBEXT@ \
wineps/libwineps.@LIBEXT@ \ wineps/libwineps.@LIBEXT@ \
wing/libwing.@LIBEXT@ \ wing/libwing.@LIBEXT@ \
wininet/libwininet.@LIBEXT@ \ wininet/libwininet.@LIBEXT@ \
...@@ -94,6 +91,7 @@ EXTRADLLNAMES = \ ...@@ -94,6 +91,7 @@ EXTRADLLNAMES = \
lzexpand \ lzexpand \
mmsystem \ mmsystem \
mouse \ mouse \
msacm \
msvideo \ msvideo \
ole2 \ ole2 \
ole2conv \ ole2conv \
...@@ -113,7 +111,9 @@ EXTRADLLNAMES = \ ...@@ -113,7 +111,9 @@ EXTRADLLNAMES = \
ver \ ver \
w32sys \ w32sys \
win32s16 \ win32s16 \
win87em \
winaspi \ winaspi \
windebug \
winsock \ winsock \
wprocs wprocs
...@@ -136,7 +136,6 @@ SUBDIRS = \ ...@@ -136,7 +136,6 @@ SUBDIRS = \
lzexpand \ lzexpand \
mpr \ mpr \
msacm \ msacm \
msacm32 \
msnet32 \ msnet32 \
msvideo \ msvideo \
odbc32 \ odbc32 \
...@@ -152,6 +151,7 @@ SUBDIRS = \ ...@@ -152,6 +151,7 @@ SUBDIRS = \
richedit \ richedit \
rpcrt4 \ rpcrt4 \
serialui \ serialui \
setupapi \
setupx \ setupx \
shell32 \ shell32 \
shfolder \ shfolder \
...@@ -164,9 +164,7 @@ SUBDIRS = \ ...@@ -164,9 +164,7 @@ SUBDIRS = \
user \ user \
version \ version \
win32s \ win32s \
win87em \
winaspi \ winaspi \
windebug \
wineps \ wineps \
wing \ wing \
wininet \ wininet \
...@@ -225,7 +223,9 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@ ...@@ -225,7 +223,9 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@ libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@
$(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@ $(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@
libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ libtoolhelp.@LIBEXT@ libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@ libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ \
libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \
libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@ $(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@ libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@
...@@ -255,14 +255,11 @@ libmidimap.drv.@LIBEXT@: winmm/midimap/libmidimap.drv.@LIBEXT@ ...@@ -255,14 +255,11 @@ libmidimap.drv.@LIBEXT@: winmm/midimap/libmidimap.drv.@LIBEXT@
libmpr.@LIBEXT@: mpr/libmpr.@LIBEXT@ libmpr.@LIBEXT@: mpr/libmpr.@LIBEXT@
$(RM) $@ && $(LN_S) mpr/libmpr.@LIBEXT@ $@ $(RM) $@ && $(LN_S) mpr/libmpr.@LIBEXT@ $@
libmsacm.@LIBEXT@: msacm/libmsacm.@LIBEXT@
$(RM) $@ && $(LN_S) msacm/libmsacm.@LIBEXT@ $@
libmsacm.drv.@LIBEXT@: winmm/wavemap/libmsacm.drv.@LIBEXT@ libmsacm.drv.@LIBEXT@: winmm/wavemap/libmsacm.drv.@LIBEXT@
$(RM) $@ && $(LN_S) winmm/wavemap/libmsacm.drv.@LIBEXT@ $@ $(RM) $@ && $(LN_S) winmm/wavemap/libmsacm.drv.@LIBEXT@ $@
libmsacm32.@LIBEXT@: msacm32/libmsacm32.@LIBEXT@ libmsacm32.@LIBEXT@ libmsacm.@LIBEXT@: msacm/libmsacm32.@LIBEXT@
$(RM) $@ && $(LN_S) msacm32/libmsacm32.@LIBEXT@ $@ $(RM) $@ && $(LN_S) msacm/libmsacm32.@LIBEXT@ $@
libmsnet32.@LIBEXT@: msnet32/libmsnet32.@LIBEXT@ libmsnet32.@LIBEXT@: msnet32/libmsnet32.@LIBEXT@
$(RM) $@ && $(LN_S) msnet32/libmsnet32.@LIBEXT@ $@ $(RM) $@ && $(LN_S) msnet32/libmsnet32.@LIBEXT@ $@
...@@ -348,12 +345,6 @@ libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@ ...@@ -348,12 +345,6 @@ libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@
libw32skrnl.@LIBEXT@ libw32sys.@LIBEXT@ libwin32s16.@LIBEXT@: win32s/libw32skrnl.@LIBEXT@ libw32skrnl.@LIBEXT@ libw32sys.@LIBEXT@ libwin32s16.@LIBEXT@: win32s/libw32skrnl.@LIBEXT@
$(RM) $@ && $(LN_S) win32s/libw32skrnl.@LIBEXT@ $@ $(RM) $@ && $(LN_S) win32s/libw32skrnl.@LIBEXT@ $@
libwin87em.@LIBEXT@: win87em/libwin87em.@LIBEXT@
$(RM) $@ && $(LN_S) win87em/libwin87em.@LIBEXT@ $@
libwindebug.@LIBEXT@: windebug/libwindebug.@LIBEXT@
$(RM) $@ && $(LN_S) windebug/libwindebug.@LIBEXT@ $@
libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@ libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@
$(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@ $(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
......
dlls/kernel/.cvsignore
View file @ 37b51f4a
*.spec.c
Makefile Makefile
comm.spec.c
kernel.spec.c
kernel32.spec.c
libkernel32.so.1.0 libkernel32.so.1.0
locale_rc.s locale_rc.s
system.spec.c
toolhelp.spec.c
wprocs.spec.c
dlls/kernel/Makefile.in
View file @ 37b51f4a
...@@ -4,10 +4,12 @@ SRCDIR = @srcdir@ ...@@ -4,10 +4,12 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = kernel32 MODULE = kernel32
SOVERSION = 1.0 SOVERSION = 1.0
ALTNAMES = comm kernel system toolhelp wprocs ALTNAMES = comm kernel system toolhelp windebug win87em wprocs
C_SRCS = \ C_SRCS = \
kernel_main.c kernel_main.c \
win87em.c \
windebug.c
RC_SRCS = \ RC_SRCS = \
locale_rc.rc locale_rc.rc
......
dlls/msacm/.cvsignore
View file @ 37b51f4a
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
*.spec.glue.s *.spec.glue.s
Makefile Makefile
libmsacm.so.1.0 libmsacm.so.1.0
libmsacm32.so.1.0
dlls/msacm/Makefile.in
View file @ 37b51f4a
...@@ -2,11 +2,18 @@ TOPSRCDIR = @top_srcdir@ ...@@ -2,11 +2,18 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = msacm MODULE = msacm32
SOVERSION = 1.0 SOVERSION = 1.0
ALTNAMES = msacm
C_SRCS = \ C_SRCS = \
msacm_main.c driver.c \
filter.c \
format.c \
internal.c \
msacm32_main.c \
msacm_main.c \
stream.c
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
......
dlls/msacm32/.cvsignore deleted 100644 → 0
View file @ 56045a55
*.spec.c
Makefile
libmsacm32.so.1.0
dlls/msacm32/Makefile.in deleted 100644 → 0
View file @ 56045a55
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msacm32
SOVERSION = 1.0
C_SRCS = \
driver.c \
filter.c \
format.c \
internal.c \
msacm32_main.c \
stream.c
@MAKE_DLL_RULES@
### Dependencies:
dlls/win87em/.cvsignore deleted 100644 → 0
View file @ 56045a55
*.spec.c
*.spec.glue.s
Makefile
libwin87em.so.1.0
dlls/win87em/Makefile.in deleted 100644 → 0
View file @ 56045a55
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = win87em
SOVERSION = 1.0
C_SRCS = \
emulate.c
@MAKE_DLL_RULES@
### Dependencies:
dlls/windebug/.cvsignore deleted 100644 → 0
View file @ 56045a55
*.spec.c
*.spec.glue.s
Makefile
libwindebug.so.1.0
dlls/windebug/Makefile.in deleted 100644 → 0
View file @ 56045a55
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = windebug
SOVERSION = 1.0
C_SRCS = \
windebug_main.c
@MAKE_DLL_RULES@
### Dependencies:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment