ole32: Make ole2thk.dll into a stand-alone 16-bit module.
diff --git a/.gitignore b/.gitignore
index 3cdca21..cffe7f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,6 @@
dlls/ole2.dll16
dlls/ole2disp.dll16
dlls/ole2nls.dll16
-dlls/ole2thk.dll16
dlls/ole32/dcom.h
dlls/ole32/dcom_p.c
dlls/ole32/irot.h
diff --git a/configure b/configure
index eb429c4..3db54ea 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index e1167f1..a123504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@
enable_msacm_dll16=${enable_msacm_dll16:-no}
enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
+ enable_ole2thk_dll16=${enable_ole2thk_dll16:-no}
enable_olecli_dll16=${enable_olecli_dll16:-no}
enable_olesvr_dll16=${enable_olesvr_dll16:-no}
enable_stress_dll16=${enable_stress_dll16:-no}
@@ -2146,6 +2147,7 @@
WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 1b3e854..d4f465a 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -32,7 +32,6 @@
ole2.dll16 \
ole2disp.dll16 \
ole2nls.dll16 \
- ole2thk.dll16 \
rasapi16.dll16 \
setupx.dll16 \
shell.dll16 \
@@ -83,7 +82,7 @@
msvideo.dll16:
echo "msvfw32.dll" >$@
-compobj.dll16 ole2.dll16 ole2nls.dll16 ole2thk.dll16 storage.dll16:
+compobj.dll16 ole2.dll16 ole2nls.dll16 storage.dll16:
echo "ole32.dll" >$@
ole2disp.dll16 typelib.dll16:
diff --git a/dlls/ole2thk.dll16/Makefile.in b/dlls/ole2thk.dll16/Makefile.in
new file mode 100644
index 0000000..e558733
--- /dev/null
+++ b/dlls/ole2thk.dll16/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = ole2thk.dll16
+IMPORTS = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,ole32.dll
+
+SPEC_SRCS = ole2thk.dll16.spec
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/ole32/ole2thk.spec b/dlls/ole2thk.dll16/ole2thk.dll16.spec
similarity index 100%
rename from dlls/ole32/ole2thk.spec
rename to dlls/ole2thk.dll16/ole2thk.dll16.spec
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 2bdbad4..d3e8198 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -57,7 +57,6 @@
compobj.spec \
ole2.spec \
ole2nls.spec \
- ole2thk.spec \
storage.spec
RC_SRCS = ole32res.rc
