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

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar 24 09:42:02 2009 +0100

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

---

 .gitignore                                         |    1 -
 configure                                          |    9 +++++++++
 configure.ac                                       |    1 +
 dlls/Makefile.in                                   |    4 ----
 dlls/w32skrnl/Makefile.in                          |    7 +------
 dlls/w32sys.dll16/Makefile.in                      |   15 +++++++++++++++
 dlls/{w32skrnl => w32sys.dll16}/w32sys.c           |    0 
 .../w32sys.spec => w32sys.dll16/w32sys.dll16.spec} |    0 
 8 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e6a9eda..961dae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,7 +92,6 @@ dlls/system.drv16
 dlls/toolhelp.dll16
 dlls/user.exe16
 dlls/ver.dll16
-dlls/w32sys.dll16
 dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/winsock.dll16
diff --git a/configure b/configure
index 6396199..a4808b5 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/w32sys.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	w32sys.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/w32sys.dll16/Makefile: dlls/w32sys.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/w32sys.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/win32s16.dll16/Makefile"
 test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	win32s16.dll16"
@@ -29439,6 +29447,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/w32sys.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32sys.dll16/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" ;;
diff --git a/configure.ac b/configure.ac
index 6be9680..78ea5db 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/w32sys.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 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])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 0d06f09..e3a9284 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -31,7 +31,6 @@ WIN16_FILES = \
 	toolhelp.dll16 \
 	user.exe16 \
 	ver.dll16 \
-	w32sys.dll16 \
 	wineps16.drv16 \
 	wing.dll16 \
 	winsock.dll16 \
@@ -72,9 +71,6 @@ ddeml.dll16 user.exe16:
 ver.dll16:
 	echo "version.dll" >$@
 
-w32sys.dll16:
-	echo "w32skrnl.dll" >$@
-
 wprocs.dll16:
 	echo "winedos.dll" >$@
 
diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in
index 4f966d3..8067d14 100644
--- a/dlls/w32skrnl/Makefile.in
+++ b/dlls/w32skrnl/Makefile.in
@@ -5,12 +5,7 @@ VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
 IMPORTS   = kernel32 ntdll
 
-C_SRCS = \
-	w32skernel.c \
-	w32sys.c
-
-SPEC_SRCS16 = \
-	w32sys.spec
+C_SRCS = w32skernel.c
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in
new file mode 100644
index 0000000..c04db41
--- /dev/null
+++ b/dlls/w32sys.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = w32sys.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,w32skrnl.dll
+
+SPEC_SRCS = w32sys.dll16.spec
+
+C_SRCS = w32sys.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/w32skrnl/w32sys.c b/dlls/w32sys.dll16/w32sys.c
similarity index 100%
rename from dlls/w32skrnl/w32sys.c
rename to dlls/w32sys.dll16/w32sys.c
diff --git a/dlls/w32skrnl/w32sys.spec b/dlls/w32sys.dll16/w32sys.dll16.spec
similarity index 100%
rename from dlls/w32skrnl/w32sys.spec
rename to dlls/w32sys.dll16/w32sys.dll16.spec