From d540fa2a28a946231088930db2ed01df2d351258 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Mar 2009 20:33:00 +0100
Subject: [PATCH] wintab32: Make wintab.dll into a stand-alone 16-bit module.

---
 .gitignore                                        |  1 -
 configure                                         |  9 +++++++++
 configure.ac                                      |  1 +
 dlls/Makefile.in                                  |  4 ----
 dlls/wintab.dll16/Makefile.in                     | 15 +++++++++++++++
 .../wintab16.c => wintab.dll16/wintab.c}          |  0
 .../wintab.dll16.spec}                            |  0
 dlls/wintab32/Makefile.in                         |  5 -----
 8 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 dlls/wintab.dll16/Makefile.in
 rename dlls/{wintab32/wintab16.c => wintab.dll16/wintab.c} (100%)
 rename dlls/{wintab32/wintab.spec => wintab.dll16/wintab.dll16.spec} (100%)

diff --git a/.gitignore b/.gitignore
index 0e05d6c7f14..1c9e49cc21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,7 +102,6 @@ dlls/wineps16.drv16
 dlls/wing.dll16
 dlls/winnls.dll16
 dlls/winsock.dll16
-dlls/wintab.dll16
 dlls/wprocs.dll16
 include/activaut.h
 include/activdbg.h
diff --git a/configure b/configure
index 86716d9a987..cb0faa0df55 100755
--- a/configure
+++ b/configure
@@ -27655,6 +27655,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules"
 ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile"
 
+ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/wintab.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	wintab.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/wintab.dll16/Makefile: dlls/wintab.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/wintab.dll16/Makefile"
+
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/wintab32/Makefile"
 test "x$enable_wintab32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@@ -29408,6 +29416,7 @@ do
     "dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;;
     "dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;;
     "dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;;
+    "dlls/wintab.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab.dll16/Makefile" ;;
     "dlls/wintab32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/Makefile" ;;
     "dlls/wintrust/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/Makefile" ;;
     "dlls/wintrust/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintrust/tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 71baeebd8d7..baa2c95e5f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2271,6 +2271,7 @@ WINE_CONFIG_MAKEFILE([dlls/winnls32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
 WINE_CONFIG_MAKEFILE([dlls/winscard/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winspool.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winspool.drv/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
+WINE_CONFIG_MAKEFILE([dlls/wintab.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/wintab32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wintrust/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wintrust/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 0600f9a9ccf..484d1c8e9c8 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -41,7 +41,6 @@ WIN16_FILES = \
 	wing.dll16 \
 	winnls.dll16 \
 	winsock.dll16 \
-	wintab.dll16 \
 	wprocs.dll16
 
 @MAKE_RULES@
@@ -100,9 +99,6 @@ mmsystem.dll16 sound.drv16:
 winnls.dll16:
 	echo "winnls32.dll" >$@
 
-wintab.dll16:
-	echo "wintab32.dll" >$@
-
 winaspi.dll16:
 	echo "wnaspi32.dll" >$@
 
diff --git a/dlls/wintab.dll16/Makefile.in b/dlls/wintab.dll16/Makefile.in
new file mode 100644
index 00000000000..855116424fe
--- /dev/null
+++ b/dlls/wintab.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = wintab.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,wintab32.dll
+
+SPEC_SRCS = wintab.dll16.spec
+
+C_SRCS = wintab.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/wintab32/wintab16.c b/dlls/wintab.dll16/wintab.c
similarity index 100%
rename from dlls/wintab32/wintab16.c
rename to dlls/wintab.dll16/wintab.c
diff --git a/dlls/wintab32/wintab.spec b/dlls/wintab.dll16/wintab.dll16.spec
similarity index 100%
rename from dlls/wintab32/wintab.spec
rename to dlls/wintab.dll16/wintab.dll16.spec
diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in
index 5c2a3c5b789..b150914c852 100644
--- a/dlls/wintab32/Makefile.in
+++ b/dlls/wintab32/Makefile.in
@@ -11,11 +11,6 @@ C_SRCS = \
 	manager.c \
 	wintab32.c
 
-C_SRCS16 = \
-	wintab16.c
-
-SPEC_SRCS16 = wintab.spec
-
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend