From 96b47ff78a660d2501862845bc8f527e887f1922 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 11 Mar 2009 16:18:03 +0100 Subject: [PATCH] lz32: Make lzexpand.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 4 ---- dlls/lz32/Makefile.in | 3 --- dlls/{lz32 => lzexpand.dll16}/Makefile.in | 11 +++++------ dlls/{lz32/lzexpand16.c => lzexpand.dll16/lzexpand.c} | 0 .../lzexpand.spec => lzexpand.dll16/lzexpand.dll16.spec} | 0 8 files changed, 17 insertions(+), 14 deletions(-) copy dlls/{lz32 => lzexpand.dll16}/Makefile.in (52%) rename dlls/{lz32/lzexpand16.c => lzexpand.dll16/lzexpand.c} (100%) rename dlls/{lz32/lzexpand.spec => lzexpand.dll16/lzexpand.dll16.spec} (100%) diff --git a/.gitignore b/.gitignore index 73e315257dc..87ad4201a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ dlls/krnl386.exe16 dlls/libd3dx9.def dlls/libwinspool.def dlls/libxinput.def -dlls/lzexpand.dll16 dlls/mmsystem.dll16 dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb diff --git a/configure b/configure index 5fe40d42b63..67bde500ca1 100755 --- a/configure +++ b/configure @@ -3906,6 +3906,7 @@ then enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_keyboard_drv16=${enable_keyboard_drv16:-no} + enable_lzexpand_dll16=${enable_lzexpand_dll16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} @@ -25871,6 +25872,14 @@ dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/lz32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/lzexpand.dll16/Makefile" +test "x$enable_lzexpand_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + lzexpand.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/lzexpand.dll16/Makefile: dlls/lzexpand.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/lzexpand.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mapi32/Makefile" test "x$enable_mapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mapi32" @@ -29070,6 +29079,7 @@ do "dlls/localui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/tests/Makefile" ;; "dlls/lz32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/Makefile" ;; "dlls/lz32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/tests/Makefile" ;; + "dlls/lzexpand.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lzexpand.dll16/Makefile" ;; "dlls/mapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; "dlls/mapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; "dlls/mciavi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mciavi32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 1246a11a7ef..09899487728 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,7 @@ then enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_keyboard_drv16=${enable_keyboard_drv16:-no} + enable_lzexpand_dll16=${enable_lzexpand_dll16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_mouse_drv16=${enable_mouse_drv16:-no} @@ -2063,6 +2064,7 @@ WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/lzexpand.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 84f9363e9a5..58582ce378b 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -27,7 +27,6 @@ WIN16_FILES = \ gdi.exe16 \ imm.dll16 \ krnl386.exe16 \ - lzexpand.dll16 \ mmsystem.dll16 \ msacm.dll16 \ msvideo.dll16 \ @@ -86,9 +85,6 @@ imm.dll16: krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@ -lzexpand.dll16: - echo "lz32.dll" >$@ - msacm.dll16: echo "msacm32.dll" >$@ diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index bd3d5fb8f25..2991f293326 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -8,9 +8,6 @@ IMPORTS = kernel32 RC_SRCS = version.rc -C_SRCS16 = lzexpand16.c -SPEC_SRCS16 = lzexpand.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/lz32/Makefile.in b/dlls/lzexpand.dll16/Makefile.in similarity index 52% copy from dlls/lz32/Makefile.in copy to dlls/lzexpand.dll16/Makefile.in index bd3d5fb8f25..aac9c074e35 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lzexpand.dll16/Makefile.in @@ -2,14 +2,13 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = lz32.dll -IMPORTLIB = lz32 -IMPORTS = kernel32 +MODULE = lzexpand.dll16 +IMPORTS = lz32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,lz32.dll -RC_SRCS = version.rc +SPEC_SRCS = lzexpand.dll16.spec -C_SRCS16 = lzexpand16.c -SPEC_SRCS16 = lzexpand.spec +C_SRCS = lzexpand.c @MAKE_DLL_RULES@ diff --git a/dlls/lz32/lzexpand16.c b/dlls/lzexpand.dll16/lzexpand.c similarity index 100% rename from dlls/lz32/lzexpand16.c rename to dlls/lzexpand.dll16/lzexpand.c diff --git a/dlls/lz32/lzexpand.spec b/dlls/lzexpand.dll16/lzexpand.dll16.spec similarity index 100% rename from dlls/lz32/lzexpand.spec rename to dlls/lzexpand.dll16/lzexpand.dll16.spec -- 2.11.4.GIT