imm32: Make imm.dll into a stand-alone 16-bit module.

.gitignore

@@ -29,7 +29,6 @@ dlls/avifile.dll16
 dlls/commdlg.dll16
 dlls/ddeml.dll16
 dlls/gdi.exe16
-dlls/imm.dll16
 dlls/jscript/jsglobal.tlb
 dlls/jscript/parser.tab.c
 dlls/jscript/parser.tab.h

configure

@@ -25656,6 +25656,14 @@ dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/imagehlp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/imm.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	imm.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/imm.dll16/Makefile: dlls/imm.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/imm.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/imm32/Makefile"
 test "x$enable_imm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	imm32"
@@ -29150,6 +29158,7 @@ do
     "dlls/ifsmgr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ifsmgr.vxd/Makefile" ;;
     "dlls/imaadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imaadp32.acm/Makefile" ;;
     "dlls/imagehlp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;;
+    "dlls/imm.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm.dll16/Makefile" ;;
     "dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;;
     "dlls/imm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/tests/Makefile" ;;
     "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;;

configure.ac

@@ -2021,6 +2021,7 @@ WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_D
 WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/imm.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

dlls/Makefile.in

@@ -22,7 +22,6 @@ WIN16_FILES = \
 	commdlg.dll16 \
 	ddeml.dll16 \
 	gdi.exe16 \
-	imm.dll16 \
 	krnl386.exe16 \
 	mmsystem.dll16 \
 	msvideo.dll16 \
@@ -62,9 +61,6 @@ commdlg.dll16:
 gdi.exe16 wing.dll16:
 	echo "gdi32.dll" >$@
 
-imm.dll16:
-	echo "imm32.dll" >$@
-
 krnl386.exe16 system.drv16 toolhelp.dll16:
 	echo "kernel32.dll" >$@
 

dlls/imm.dll16/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = imm.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,imm32.dll
+
+SPEC_SRCS = imm.dll16.spec
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/imm32/Makefile.in

@@ -11,8 +11,6 @@ C_SRCS = \
 
 RC_SRCS = version.rc
 
-SPEC_SRCS16 = imm.spec
-
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend