Commit 41600a82 authored by Alexandre Julliard's avatar Alexandre Julliard

kernel32: Make comm.drv into a stand-alone 16-bit module.

parent a9e81624
...@@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h ...@@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h
dlls/advapi32/svcctl_c.c dlls/advapi32/svcctl_c.c
dlls/atl/atliface.h dlls/atl/atliface.h
dlls/avifile.dll16 dlls/avifile.dll16
dlls/comm.drv16
dlls/commdlg.dll16 dlls/commdlg.dll16
dlls/compobj.dll16 dlls/compobj.dll16
dlls/ctl3d.dll16 dlls/ctl3d.dll16
......
...@@ -3901,6 +3901,7 @@ if test "x$enable_win16" != "xyes" ...@@ -3901,6 +3901,7 @@ if test "x$enable_win16" != "xyes"
then then
WIN16_FILES="" WIN16_FILES=""
WIN16_INSTALL="" WIN16_INSTALL=""
enable_comm_drv16=${enable_comm_drv16:-no}
enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no}
...@@ -24557,6 +24558,14 @@ dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rule ...@@ -24557,6 +24558,14 @@ dlls/comdlg32/tests/Makefile: dlls/comdlg32/tests/Makefile.in dlls/Maketest.rule
ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile" ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/comm.drv16/Makefile"
test "x$enable_comm_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
comm.drv16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/comm.drv16/Makefile: dlls/comm.drv16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/comm.drv16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/compstui/Makefile" dlls/compstui/Makefile"
test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
compstui" compstui"
...@@ -28688,6 +28697,7 @@ do ...@@ -28688,6 +28697,7 @@ do
"dlls/comctl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comctl32/tests/Makefile" ;; "dlls/comctl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comctl32/tests/Makefile" ;;
"dlls/comdlg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/Makefile" ;; "dlls/comdlg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/Makefile" ;;
"dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;; "dlls/comdlg32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/tests/Makefile" ;;
"dlls/comm.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comm.drv16/Makefile" ;;
"dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;; "dlls/compstui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/compstui/Makefile" ;;
"dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;; "dlls/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;;
"dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;; "dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;;
......
...@@ -138,6 +138,7 @@ if test "x$enable_win16" != "xyes" ...@@ -138,6 +138,7 @@ if test "x$enable_win16" != "xyes"
then then
WIN16_FILES="" WIN16_FILES=""
WIN16_INSTALL="" WIN16_INSTALL=""
enable_comm_drv16=${enable_comm_drv16:-no}
enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no}
...@@ -1902,6 +1903,7 @@ WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D ...@@ -1902,6 +1903,7 @@ WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/comm.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
......
...@@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS) ...@@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS)
WIN16_FILES = \ WIN16_FILES = \
avifile.dll16 \ avifile.dll16 \
comm.drv16 \
commdlg.dll16 \ commdlg.dll16 \
compobj.dll16 \ compobj.dll16 \
ctl3d.dll16 \ ctl3d.dll16 \
...@@ -89,7 +88,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: ...@@ -89,7 +88,7 @@ dispdib.dll16 gdi.exe16 wing.dll16:
imm.dll16: imm.dll16:
echo "imm32.dll" >$@ echo "imm32.dll" >$@
comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16: krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16:
echo "kernel32.dll" >$@ echo "kernel32.dll" >$@
lzexpand.dll16: lzexpand.dll16:
......
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comm.drv16
IMPORTS = kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16
SPEC_SRCS = comm.drv16.spec
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
...@@ -10,7 +10,6 @@ EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ ...@@ -10,7 +10,6 @@ EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
SPEC_SRCS16 = \ SPEC_SRCS16 = \
comm.drv.spec \
krnl386.exe.spec \ krnl386.exe.spec \
system.drv.spec \ system.drv.spec \
toolhelp.spec \ toolhelp.spec \
......
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