twain_32: Make twain.dll into a stand-alone 16-bit module.
diff --git a/.gitignore b/.gitignore
index a5cf0b1..8b5e888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,7 +92,6 @@
dlls/stdole32.tlb/std_ole_v1.tlb
dlls/system.drv16
dlls/toolhelp.dll16
-dlls/twain.dll16
dlls/user.exe16
dlls/ver.dll16
dlls/w32sys.dll16
diff --git a/configure b/configure
index 2e4b0df..fe3756a 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index d1b2729..7616588 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2216,6 +2216,7 @@
WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/twain.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 2022039..ac1767a 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -31,7 +31,6 @@
sound.drv16 \
system.drv16 \
toolhelp.dll16 \
- twain.dll16 \
user.exe16 \
ver.dll16 \
w32sys.dll16 \
@@ -74,9 +73,6 @@
shell.dll16:
echo "shell32.dll" >$@
-twain.dll16:
- echo "twain_32.dll" >$@
-
ddeml.dll16 user.exe16:
echo "user32.dll" >$@
diff --git a/dlls/twain.dll16/Makefile.in b/dlls/twain.dll16/Makefile.in
new file mode 100644
index 0000000..ba8e564
--- /dev/null
+++ b/dlls/twain.dll16/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = twain.dll16
+IMPORTS = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,twain_32.dll
+
+SPEC_SRCS = twain.dll16.spec
+
+C_SRCS = twain.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/twain_32/twain16_main.c b/dlls/twain.dll16/twain.c
similarity index 97%
rename from dlls/twain_32/twain16_main.c
rename to dlls/twain.dll16/twain.c
index 0a874c3..92ebf57 100644
--- a/dlls/twain_32/twain16_main.c
+++ b/dlls/twain.dll16/twain.c
@@ -25,7 +25,6 @@
#include "windef.h"
#include "winbase.h"
#include "twain.h"
-#include "twain_i.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(twain);
diff --git a/dlls/twain_32/twain.spec b/dlls/twain.dll16/twain.dll16.spec
similarity index 100%
rename from dlls/twain_32/twain.spec
rename to dlls/twain.dll16/twain.dll16.spec
diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in
index 3fc9776..17151c0 100644
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
@@ -9,11 +9,6 @@
dsm_ctrl.c \
twain32_main.c
-C_SRCS16 = \
- twain16_main.c
-
-SPEC_SRCS16 = twain.spec
-
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
