Alexandre Julliard : kernel32: Make comm. drv into a stand-alone 16-bit module.
Alexandre Julliard
julliard at winehq.org
Wed Mar 4 09:01:01 CST 2009
Module: wine
Branch: master
Commit: 41600a82267567713e6c00098798ff65f16058a3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=41600a82267567713e6c00098798ff65f16058a3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 4 14:22:24 2009 +0100
kernel32: Make comm.drv into a stand-alone 16-bit module.
---
.gitignore | 1 -
configure | 10 ++++++++++
configure.ac | 2 ++
dlls/Makefile.in | 3 +--
dlls/comm.drv16/Makefile.in | 13 +++++++++++++
.../comm.drv.spec => comm.drv16/comm.drv16.spec} | 0
dlls/kernel32/Makefile.in | 1 -
7 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 52d76d4..3ba4b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ dlls/advapi32/svcctl.h
dlls/advapi32/svcctl_c.c
dlls/atl/atliface.h
dlls/avifile.dll16
-dlls/comm.drv16
dlls/commdlg.dll16
dlls/compobj.dll16
dlls/ctl3d.dll16
diff --git a/configure b/configure
index a335b24..c8ffeba 100755
--- a/configure
+++ b/configure
@@ -3901,6 +3901,7 @@ if test "x$enable_win16" != "xyes"
then
WIN16_FILES=""
WIN16_INSTALL=""
+ enable_comm_drv16=${enable_comm_drv16:-no}
enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
enable_mmdevldr_vxd=${enable_mmdevldr_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
ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile"
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"
test "x$enable_compstui" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
compstui"
@@ -28688,6 +28697,7 @@ do
"dlls/comctl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comctl32/tests/Makefile" ;;
"dlls/comdlg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/comdlg32/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/credui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/Makefile" ;;
"dlls/credui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/credui/tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 133f239..cd50b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,7 @@ if test "x$enable_win16" != "xyes"
then
WIN16_FILES=""
WIN16_INSTALL=""
+ enable_comm_drv16=${enable_comm_drv16:-no}
enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
enable_mmdevldr_vxd=${enable_mmdevldr_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
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/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/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])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 8b1c14f..cd6103b 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -19,7 +19,6 @@ DOCSUBDIRS = $(DLLSUBDIRS)
WIN16_FILES = \
avifile.dll16 \
- comm.drv16 \
commdlg.dll16 \
compobj.dll16 \
ctl3d.dll16 \
@@ -89,7 +88,7 @@ dispdib.dll16 gdi.exe16 wing.dll16:
imm.dll16:
echo "imm32.dll" >$@
-comm.drv16 krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16:
+krnl386.exe16 system.drv16 toolhelp.dll16 windebug.dll16:
echo "kernel32.dll" >$@
lzexpand.dll16:
diff --git a/dlls/comm.drv16/Makefile.in b/dlls/comm.drv16/Makefile.in
new file mode 100644
index 0000000..481b933
--- /dev/null
+++ b/dlls/comm.drv16/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = comm.drv16
+IMPORTS = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16
+
+SPEC_SRCS = comm.drv16.spec
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/kernel32/comm.drv.spec b/dlls/comm.drv16/comm.drv16.spec
similarity index 100%
rename from dlls/kernel32/comm.drv.spec
rename to dlls/comm.drv16/comm.drv16.spec
diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index 3dec8f9..f782634 100644
--- a/dlls/kernel32/Makefile.in
+++ b/dlls/kernel32/Makefile.in
@@ -10,7 +10,6 @@ EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@
EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
SPEC_SRCS16 = \
- comm.drv.spec \
krnl386.exe.spec \
system.drv.spec \
toolhelp.spec \
More information about the wine-cvs
mailing list