diff --git a/.gitignore b/.gitignore index 3853e129b0e8689ff14d567124580a993566b6e7..0e05d6c7f14a2737872b93bfeb823f8658b7d247 100644 --- a/.gitignore +++ b/.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 diff --git a/configure b/configure index 1dad9dcb1413fc70d6008d47b4eb513f884db9c7..86716d9a98746f203ce54d73d9f6c94c2e44159e 100755 --- a/configure +++ b/configure @@ -25655,6 +25655,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS 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 \\ @@ -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" ;; diff --git a/configure.ac b/configure.ac index 160cabb36ffce27f683d0a0be67d80314d102b24..71baeebd8d76878c08f21d32976e965f66ee37b3 100644 --- a/configure.ac +++ b/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]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index cb7e6940b5170e739bfb5ee8eb3ac67b36378abd..0600f9a9ccfeb40ac64d1e76eb92db8d336c6f1f 100644 --- a/dlls/Makefile.in +++ b/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" >$@ diff --git a/dlls/imm.dll16/Makefile.in b/dlls/imm.dll16/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..7ea14e8bbd98166c96e635f525a246f1847eec80 --- /dev/null +++ b/dlls/imm.dll16/Makefile.in @@ -0,0 +1,13 @@ +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 diff --git a/dlls/imm32/imm.spec b/dlls/imm.dll16/imm.dll16.spec similarity index 100% rename from dlls/imm32/imm.spec rename to dlls/imm.dll16/imm.dll16.spec diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 909f29bb1b2cb277f7c35b287b7917d46e860687..52a55159fbbd11811b9b2c17fc32502c1d95732f 100644 --- a/dlls/imm32/Makefile.in +++ b/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