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

.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

configure

@@ -27455,6 +27455,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 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 \\
@@ -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" ;;

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])

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:

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@
 

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