Alexandre Julliard : w32skrnl: Make win32s16. dll into a stand-alone 16-bit module.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2a745fecd235fa049e9b7c7f27ce21e31313f4fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a745fecd235fa049e9b7c7f27...

Author: Alexandre Julliard 
Date:   Tue Mar 24 09:38:01 2009 +0100

w32skrnl: Make win32s16.dll into a stand-alone 16-bit module.

---

.gitignore                                         |    1 -
 configure                                          |    9 +++++++++
 configure.ac                                       |    1 +
 dlls/Makefile.in                                   |    3 +--
 dlls/w32skrnl/Makefile.in                          |    6 +-----
 dlls/win32s16.dll16/Makefile.in                    |   15 +++++++++++++++
 dlls/{w32skrnl => win32s16.dll16}/win32s16.c       |    0 
 .../win32s16.dll16.spec}                           |    0 
 8 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2c44c2..e6a9eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,7 +93,6 @@ dlls/toolhelp.dll16
 dlls/user.exe16
 dlls/ver.dll16
 dlls/w32sys.dll16
-dlls/win32s16.dll16
 dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/winsock.dll16
diff --git a/configure b/configure
index e11f83c..6396199 100755
--- a/configure
+++ b/configure
@@ -27456,6 +27456,14 @@ dlls/w32skrnl/Makefile: dlls/w32skrnl/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/w32skrnl/Makefile"

ALL_MAKEFILES="$ALL_MAKEFILES \
+	dlls/win32s16.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \
+	win32s16.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/win32s16.dll16/Makefile: dlls/win32s16.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/win32s16.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \
    dlls/win87em.dll16/Makefile"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \
    win87em.dll16"
@@ -29431,6 +29439,7 @@ do
     "dlls/vtdapi.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vtdapi.vxd/Makefile" ;;
     "dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;;
     "dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;;
+    "dlls/win32s16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win32s16.dll16/Makefile" ;;
     "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;;
     "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;;
     "dlls/windebug.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/windebug.dll16/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 9ee0e88..6be9680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2246,6 +2246,7 @@ WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[A
 WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2de197d..0d06f09 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -32,7 +32,6 @@ WIN16_FILES = \
    user.exe16 \
    ver.dll16 \
    w32sys.dll16 \
-	win32s16.dll16 \
    wineps16.drv16 \
    wing.dll16 \
    winsock.dll16 \
@@ -73,7 +72,7 @@ ddeml.dll16 user.exe16:
 ver.dll16:
    echo "version.dll" >$@

-w32sys.dll16 win32s16.dll16:
+w32sys.dll16:
    echo "w32skrnl.dll" >$@

wprocs.dll16:
diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in
index 61017ce..4f966d3 100644
--- a/dlls/w32skrnl/Makefile.in
+++ b/dlls/w32skrnl/Makefile.in
@@ -9,12 +9,8 @@ C_SRCS = \
    w32skernel.c \
    w32sys.c

-C_SRCS16 = \
-	win32s16.c
-
 SPEC_SRCS16 = \
-	w32sys.spec \
-	win32s16.spec
+	w32sys.spec

@MAKE_DLL_RULES@

diff --git a/dlls/win32s16.dll16/Makefile.in b/dlls/win32s16.dll16/Makefile.in
new file mode 100644
index 0000000..bb1bdf6
--- /dev/null
+++ b/dlls/win32s16.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = win32s16.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
+
+SPEC_SRCS = win32s16.dll16.spec
+
+C_SRCS = win32s16.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/w32skrnl/win32s16.c b/dlls/win32s16.dll16/win32s16.c
similarity index 100%
rename from dlls/w32skrnl/win32s16.c
rename to dlls/win32s16.dll16/win32s16.c
diff --git a/dlls/w32skrnl/win32s16.spec b/dlls/win32s16.dll16/win32s16.dll16.spec
similarity index 100%
rename from dlls/w32skrnl/win32s16.spec
rename to dlls/win32s16.dll16/win32s16.dll16.spec