Merged msacm and msacm32 dlls.
Merged win87em and windebug into kernel32.dll.
This commit is contained in:
Alexandre Julliard
parent
56045a55d8
commit
37b51f4acc
|
|
@ -116,7 +116,6 @@ DLLS = \
|
|||
mciwave.drv \
|
||||
midimap.drv \
|
||||
mpr \
|
||||
msacm \
|
||||
msacm.drv \
|
||||
msacm32 \
|
||||
msnet32 \
|
||||
|
|
@ -146,8 +145,6 @@ DLLS = \
|
|||
user32 \
|
||||
version \
|
||||
w32skrnl \
|
||||
win87em \
|
||||
windebug \
|
||||
wineoss.drv \
|
||||
wineps \
|
||||
wing \
|
||||
|
|
|
|||
|
|
@ -6260,7 +6260,6 @@ dlls/kernel/Makefile
|
|||
dlls/lzexpand/Makefile
|
||||
dlls/mpr/Makefile
|
||||
dlls/msacm/Makefile
|
||||
dlls/msacm32/Makefile
|
||||
dlls/msnet32/Makefile
|
||||
dlls/msvideo/Makefile
|
||||
dlls/ntdll/Makefile
|
||||
|
|
@ -6291,9 +6290,7 @@ dlls/urlmon/Makefile
|
|||
dlls/user/Makefile
|
||||
dlls/version/Makefile
|
||||
dlls/win32s/Makefile
|
||||
dlls/win87em/Makefile
|
||||
dlls/winaspi/Makefile
|
||||
dlls/windebug/Makefile
|
||||
dlls/wineps/Makefile
|
||||
dlls/wing/Makefile
|
||||
dlls/wininet/Makefile
|
||||
|
|
@ -6503,7 +6500,6 @@ dlls/kernel/Makefile
|
|||
dlls/lzexpand/Makefile
|
||||
dlls/mpr/Makefile
|
||||
dlls/msacm/Makefile
|
||||
dlls/msacm32/Makefile
|
||||
dlls/msnet32/Makefile
|
||||
dlls/msvideo/Makefile
|
||||
dlls/ntdll/Makefile
|
||||
|
|
@ -6534,9 +6530,7 @@ dlls/urlmon/Makefile
|
|||
dlls/user/Makefile
|
||||
dlls/version/Makefile
|
||||
dlls/win32s/Makefile
|
||||
dlls/win87em/Makefile
|
||||
dlls/winaspi/Makefile
|
||||
dlls/windebug/Makefile
|
||||
dlls/wineps/Makefile
|
||||
dlls/wing/Makefile
|
||||
dlls/wininet/Makefile
|
||||
|
|
|
|||
|
|
@ -1004,7 +1004,6 @@ dlls/kernel/Makefile
|
|||
dlls/lzexpand/Makefile
|
||||
dlls/mpr/Makefile
|
||||
dlls/msacm/Makefile
|
||||
dlls/msacm32/Makefile
|
||||
dlls/msnet32/Makefile
|
||||
dlls/msvideo/Makefile
|
||||
dlls/ntdll/Makefile
|
||||
|
|
@ -1035,9 +1034,7 @@ dlls/urlmon/Makefile
|
|||
dlls/user/Makefile
|
||||
dlls/version/Makefile
|
||||
dlls/win32s/Makefile
|
||||
dlls/win87em/Makefile
|
||||
dlls/winaspi/Makefile
|
||||
dlls/windebug/Makefile
|
||||
dlls/wineps/Makefile
|
||||
dlls/wing/Makefile
|
||||
dlls/wininet/Makefile
|
||||
|
|
|
|||
|
|
@ -29,8 +29,7 @@ DLLFILES = \
|
|||
kernel/libkernel32.@LIBEXT@ \
|
||||
lzexpand/liblz32.@LIBEXT@ \
|
||||
mpr/libmpr.@LIBEXT@ \
|
||||
msacm/libmsacm.@LIBEXT@ \
|
||||
msacm32/libmsacm32.@LIBEXT@ \
|
||||
msacm/libmsacm32.@LIBEXT@ \
|
||||
msnet32/libmsnet32.@LIBEXT@ \
|
||||
msvideo/libmsvfw32.@LIBEXT@ \
|
||||
odbc32/libodbc32.@LIBEXT@ \
|
||||
|
|
@ -58,9 +57,7 @@ DLLFILES = \
|
|||
user/libuser32.@LIBEXT@ \
|
||||
version/libversion.@LIBEXT@ \
|
||||
win32s/libw32skrnl.@LIBEXT@ \
|
||||
win87em/libwin87em.@LIBEXT@ \
|
||||
winaspi/libwnaspi32.@LIBEXT@ \
|
||||
windebug/libwindebug.@LIBEXT@ \
|
||||
wineps/libwineps.@LIBEXT@ \
|
||||
wing/libwing.@LIBEXT@ \
|
||||
wininet/libwininet.@LIBEXT@ \
|
||||
|
|
@ -94,6 +91,7 @@ EXTRADLLNAMES = \
|
|||
lzexpand \
|
||||
mmsystem \
|
||||
mouse \
|
||||
msacm \
|
||||
msvideo \
|
||||
ole2 \
|
||||
ole2conv \
|
||||
|
|
@ -113,7 +111,9 @@ EXTRADLLNAMES = \
|
|||
ver \
|
||||
w32sys \
|
||||
win32s16 \
|
||||
win87em \
|
||||
winaspi \
|
||||
windebug \
|
||||
winsock \
|
||||
wprocs
|
||||
|
||||
|
|
@ -136,7 +136,6 @@ SUBDIRS = \
|
|||
lzexpand \
|
||||
mpr \
|
||||
msacm \
|
||||
msacm32 \
|
||||
msnet32 \
|
||||
msvideo \
|
||||
odbc32 \
|
||||
|
|
@ -152,6 +151,7 @@ SUBDIRS = \
|
|||
richedit \
|
||||
rpcrt4 \
|
||||
serialui \
|
||||
setupapi \
|
||||
setupx \
|
||||
shell32 \
|
||||
shfolder \
|
||||
|
|
@ -164,9 +164,7 @@ SUBDIRS = \
|
|||
user \
|
||||
version \
|
||||
win32s \
|
||||
win87em \
|
||||
winaspi \
|
||||
windebug \
|
||||
wineps \
|
||||
wing \
|
||||
wininet \
|
||||
|
|
@ -225,7 +223,9 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
|
|||
libimm32.@LIBEXT@: 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@ $@
|
||||
|
||||
libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@
|
||||
|
|
@ -255,14 +255,11 @@ libmidimap.drv.@LIBEXT@: winmm/midimap/libmidimap.drv.@LIBEXT@
|
|||
libmpr.@LIBEXT@: 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@
|
||||
$(RM) $@ && $(LN_S) winmm/wavemap/libmsacm.drv.@LIBEXT@ $@
|
||||
|
||||
libmsacm32.@LIBEXT@: msacm32/libmsacm32.@LIBEXT@
|
||||
$(RM) $@ && $(LN_S) msacm32/libmsacm32.@LIBEXT@ $@
|
||||
libmsacm32.@LIBEXT@ libmsacm.@LIBEXT@: msacm/libmsacm32.@LIBEXT@
|
||||
$(RM) $@ && $(LN_S) msacm/libmsacm32.@LIBEXT@ $@
|
||||
|
||||
libmsnet32.@LIBEXT@: msnet32/libmsnet32.@LIBEXT@
|
||||
$(RM) $@ && $(LN_S) msnet32/libmsnet32.@LIBEXT@ $@
|
||||
|
|
@ -348,12 +345,6 @@ libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@
|
|||
libw32skrnl.@LIBEXT@ libw32sys.@LIBEXT@ libwin32s16.@LIBEXT@: 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@
|
||||
$(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
*.spec.c
|
||||
Makefile
|
||||
comm.spec.c
|
||||
kernel.spec.c
|
||||
kernel32.spec.c
|
||||
libkernel32.so.1.0
|
||||
locale_rc.s
|
||||
system.spec.c
|
||||
toolhelp.spec.c
|
||||
wprocs.spec.c
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@ SRCDIR = @srcdir@
|
|||
VPATH = @srcdir@
|
||||
MODULE = kernel32
|
||||
SOVERSION = 1.0
|
||||
ALTNAMES = comm kernel system toolhelp wprocs
|
||||
ALTNAMES = comm kernel system toolhelp windebug win87em wprocs
|
||||
|
||||
C_SRCS = \
|
||||
kernel_main.c
|
||||
kernel_main.c \
|
||||
win87em.c \
|
||||
windebug.c
|
||||
|
||||
RC_SRCS = \
|
||||
locale_rc.rc
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@
|
|||
*.spec.glue.s
|
||||
Makefile
|
||||
libmsacm.so.1.0
|
||||
libmsacm32.so.1.0
|
||||
|
|
|
|||
|
|
@ -2,11 +2,18 @@ TOPSRCDIR = @top_srcdir@
|
|||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
MODULE = msacm
|
||||
MODULE = msacm32
|
||||
SOVERSION = 1.0
|
||||
ALTNAMES = msacm
|
||||
|
||||
C_SRCS = \
|
||||
msacm_main.c
|
||||
driver.c \
|
||||
filter.c \
|
||||
format.c \
|
||||
internal.c \
|
||||
msacm32_main.c \
|
||||
msacm_main.c \
|
||||
stream.c
|
||||
|
||||
@MAKE_DLL_RULES@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
*.spec.c
|
||||
Makefile
|
||||
libmsacm32.so.1.0
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
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:
|
||||
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
*.spec.c
|
||||
*.spec.glue.s
|
||||
Makefile
|
||||
libwin87em.so.1.0
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
MODULE = win87em
|
||||
SOVERSION = 1.0
|
||||
|
||||
C_SRCS = \
|
||||
emulate.c
|
||||
|
||||
@MAKE_DLL_RULES@
|
||||
|
||||
### Dependencies:
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
*.spec.c
|
||||
*.spec.glue.s
|
||||
Makefile
|
||||
libwindebug.so.1.0
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ../..
|
||||
SRCDIR = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
MODULE = windebug
|
||||
SOVERSION = 1.0
|
||||
|
||||
C_SRCS = \
|
||||
windebug_main.c
|
||||
|
||||
@MAKE_DLL_RULES@
|
||||
|
||||
### Dependencies:
|
||||
|
||||
Loading…
Reference in New Issue