From 1c31b75e622f27de3a8d771e3bcf5fde8fda0be4 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 22 Feb 2018 17:03:44 +0100 Subject: [PATCH] makefiles: Generate the top-level import library rules from makedep. Signed-off-by: Alexandre Julliard --- aclocal.m4 | 72 +------- configure | 426 ++++++++++++++++++------------------------- configure.ac | 370 ++++++++++++++++++------------------- tools/make_makefiles | 23 +-- tools/makedep.c | 67 ++++++- 5 files changed, 445 insertions(+), 513 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ce6aba9562f..4fc6cd4e57a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -230,11 +230,6 @@ wine_fn_append_rule () AS_ECHO("$[1]") >>$wine_rules_file } -wine_fn_has_flag () -{ - expr ",$ac_flags," : ".*,$[1],.*" >/dev/null -} - wine_fn_all_rules () { wine_fn_append_file SUBDIRS $ac_dir @@ -283,69 +278,14 @@ wine_fn_config_dll () ac_name=$[1] ac_dir=dlls/$ac_name ac_enable=$[2] - ac_flags=$[3] - ac_implib=${4:-$ac_name} - ac_file=$ac_dir/lib$ac_implib - ac_dll=$ac_name - ac_deps="include" - ac_implibflags="" - AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"]) - case $ac_name in - *.*16) ac_implibflags=" -m16" ;; - *.*) ;; - *) ac_dll=$ac_dll.dll ;; - esac + AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return]) - AS_VAR_IF([$ac_enable],[no], - dnl enable_win16 is special in that it disables import libs too - [if test "$ac_enable" != enable_win16 - then - wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_file DISABLED_SUBDIRS $ac_dir - else - wine_fn_disabled_rules - return - fi], - - [wine_fn_all_rules - wine_fn_append_rule \ + wine_fn_all_rules + wine_fn_append_rule \ "$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: - @cd $ac_dir && \$(MAKE) \$[@]"]) - - if wine_fn_has_flag staticimplib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.a -$ac_file.a $ac_file.cross.a: $ac_deps -$ac_file.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.a" - - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a" - fi - - elif wine_fn_has_flag implib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" - fi - fi + @cd $ac_dir && \$(MAKE) \$[@]" } wine_fn_config_program () @@ -457,13 +397,13 @@ AS_VAR_POPDEF([ac_enable])]) dnl **** Create a dll makefile from config.status **** dnl -dnl Usage: WINE_CONFIG_DLL(name,enable,flags,implib) +dnl Usage: WINE_CONFIG_DLL(name,enable) dnl AC_DEFUN([WINE_CONFIG_DLL],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl AS_VAR_PUSHDEF([ac_enable],m4_default([$2],[enable_]$1))dnl m4_append_uniq([_AC_USER_OPTS],ac_enable,[ ])dnl -wine_fn_config_dll [$1] ac_enable [$3] [$4]dnl +wine_fn_config_dll [$1] ac_enable[]dnl AS_VAR_POPDEF([ac_enable])]) dnl **** Create a program makefile from config.status **** diff --git a/configure b/configure index d21bd541389..6c09a96529e 100755 --- a/configure +++ b/configure @@ -7726,11 +7726,6 @@ wine_fn_append_rule () $as_echo "$1" >>$wine_rules_file } -wine_fn_has_flag () -{ - expr ",$ac_flags," : ".*,$1,.*" >/dev/null -} - wine_fn_all_rules () { wine_fn_append_file SUBDIRS $ac_dir @@ -7784,73 +7779,16 @@ wine_fn_config_dll () ac_name=$1 ac_dir=dlls/$ac_name ac_enable=$2 - ac_flags=$3 - ac_implib=${4:-$ac_name} - ac_file=$ac_dir/lib$ac_implib - ac_dll=$ac_name - ac_deps="include" - ac_implibflags="" - - if test "x$enable_tools" = xno; then : - -else - ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps" -fi - case $ac_name in - *.*16) ac_implibflags=" -m16" ;; - *.*) ;; - *) ac_dll=$ac_dll.dll ;; - esac if eval test \"x\$"$ac_enable"\" = x"no"; then : - if test "$ac_enable" != enable_win16 - then - wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_file DISABLED_SUBDIRS $ac_dir - else - wine_fn_disabled_rules - return - fi -else - wine_fn_all_rules - wine_fn_append_rule \ + wine_fn_disabled_rules; return +fi + + wine_fn_all_rules + wine_fn_append_rule \ "$ac_dir: __builddeps__ manpages htmlpages sgmlpages xmlpages:: @cd $ac_dir && \$(MAKE) \$@" -fi - - if wine_fn_has_flag staticimplib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.a -$ac_file.a $ac_file.cross.a: $ac_deps -$ac_file.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.a" - - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.cross.a" - fi - - elif wine_fn_has_flag implib - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" - then - wine_fn_append_rule \ -"__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" - fi - fi } wine_fn_config_program () @@ -18252,16 +18190,16 @@ wine_fn_config_symlink wine64 fi wine_fn_config_dll acledit enable_acledit -wine_fn_config_dll aclui enable_aclui implib -wine_fn_config_dll activeds enable_activeds implib +wine_fn_config_dll aclui enable_aclui +wine_fn_config_dll activeds enable_activeds wine_fn_config_dll actxprxy enable_actxprxy wine_fn_config_lib adsiid wine_fn_config_dll adsldp enable_adsldp wine_fn_config_test dlls/adsldp/tests adsldp_test wine_fn_config_dll adsldpc enable_adsldpc -wine_fn_config_dll advapi32 enable_advapi32 implib +wine_fn_config_dll advapi32 enable_advapi32 wine_fn_config_test dlls/advapi32/tests advapi32_test -wine_fn_config_dll advpack enable_advpack implib +wine_fn_config_dll advpack enable_advpack wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test @@ -18465,79 +18403,79 @@ wine_fn_config_dll api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_ wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl -wine_fn_config_dll atl enable_atl implib +wine_fn_config_dll atl enable_atl wine_fn_config_test dlls/atl/tests atl_test -wine_fn_config_dll atl100 enable_atl100 implib +wine_fn_config_dll atl100 enable_atl100 wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl110 enable_atl110 -wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_dll atl80 enable_atl80 wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll atl90 enable_atl90 wine_fn_config_dll authz enable_authz -wine_fn_config_dll avicap32 enable_avicap32 implib -wine_fn_config_dll avifil32 enable_avifil32 implib +wine_fn_config_dll avicap32 enable_avicap32 +wine_fn_config_dll avifil32 enable_avifil32 wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 -wine_fn_config_dll avrt enable_avrt implib -wine_fn_config_dll bcrypt enable_bcrypt implib +wine_fn_config_dll avrt enable_avrt +wine_fn_config_dll bcrypt enable_bcrypt wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll bluetoothapis enable_bluetoothapis wine_fn_config_dll browseui enable_browseui wine_fn_config_test dlls/browseui/tests browseui_test wine_fn_config_dll bthprops.cpl enable_bthprops_cpl -wine_fn_config_dll cabinet enable_cabinet implib +wine_fn_config_dll cabinet enable_cabinet wine_fn_config_test dlls/cabinet/tests cabinet_test -wine_fn_config_dll capi2032 enable_capi2032 implib -wine_fn_config_dll cards enable_cards implib +wine_fn_config_dll capi2032 enable_capi2032 +wine_fn_config_dll cards enable_cards wine_fn_config_dll cdosys enable_cdosys -wine_fn_config_dll cfgmgr32 enable_cfgmgr32 implib -wine_fn_config_dll clusapi enable_clusapi implib +wine_fn_config_dll cfgmgr32 enable_cfgmgr32 +wine_fn_config_dll clusapi enable_clusapi wine_fn_config_dll combase enable_combase wine_fn_config_test dlls/combase/tests combase_test wine_fn_config_dll comcat enable_comcat wine_fn_config_test dlls/comcat/tests comcat_test -wine_fn_config_dll comctl32 enable_comctl32 implib +wine_fn_config_dll comctl32 enable_comctl32 wine_fn_config_test dlls/comctl32/tests comctl32_test -wine_fn_config_dll comdlg32 enable_comdlg32 implib +wine_fn_config_dll comdlg32 enable_comdlg32 wine_fn_config_test dlls/comdlg32/tests comdlg32_test wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 -wine_fn_config_dll compstui enable_compstui implib -wine_fn_config_dll comsvcs enable_comsvcs implib +wine_fn_config_dll compstui enable_compstui +wine_fn_config_dll comsvcs enable_comsvcs wine_fn_config_dll concrt140 enable_concrt140 wine_fn_config_dll connect enable_connect -wine_fn_config_dll credui enable_credui implib +wine_fn_config_dll credui enable_credui wine_fn_config_test dlls/credui/tests credui_test wine_fn_config_dll crtdll enable_crtdll -wine_fn_config_dll crypt32 enable_crypt32 implib +wine_fn_config_dll crypt32 enable_crypt32 wine_fn_config_test dlls/crypt32/tests crypt32_test wine_fn_config_dll cryptdlg enable_cryptdlg -wine_fn_config_dll cryptdll enable_cryptdll implib +wine_fn_config_dll cryptdll enable_cryptdll wine_fn_config_dll cryptext enable_cryptext -wine_fn_config_dll cryptnet enable_cryptnet implib +wine_fn_config_dll cryptnet enable_cryptnet wine_fn_config_test dlls/cryptnet/tests cryptnet_test -wine_fn_config_dll cryptui enable_cryptui implib +wine_fn_config_dll cryptui enable_cryptui wine_fn_config_test dlls/cryptui/tests cryptui_test wine_fn_config_dll ctapi32 enable_ctapi32 wine_fn_config_dll ctl3d.dll16 enable_win16 wine_fn_config_dll ctl3d32 enable_ctl3d32 wine_fn_config_dll ctl3dv2.dll16 enable_win16 -wine_fn_config_dll d2d1 enable_d2d1 implib +wine_fn_config_dll d2d1 enable_d2d1 wine_fn_config_test dlls/d2d1/tests d2d1_test -wine_fn_config_dll d3d10 enable_d3d10 implib +wine_fn_config_dll d3d10 enable_d3d10 wine_fn_config_test dlls/d3d10/tests d3d10_test -wine_fn_config_dll d3d10_1 enable_d3d10_1 implib +wine_fn_config_dll d3d10_1 enable_d3d10_1 wine_fn_config_test dlls/d3d10_1/tests d3d10_1_test -wine_fn_config_dll d3d10core enable_d3d10core implib +wine_fn_config_dll d3d10core enable_d3d10core wine_fn_config_test dlls/d3d10core/tests d3d10core_test -wine_fn_config_dll d3d11 enable_d3d11 implib +wine_fn_config_dll d3d11 enable_d3d11 wine_fn_config_test dlls/d3d11/tests d3d11_test -wine_fn_config_dll d3d12 enable_d3d12 implib +wine_fn_config_dll d3d12 enable_d3d12 wine_fn_config_test dlls/d3d12/tests d3d12_test -wine_fn_config_dll d3d8 enable_d3d8 implib +wine_fn_config_dll d3d8 enable_d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test -wine_fn_config_dll d3d9 enable_d3d9 implib +wine_fn_config_dll d3d9 enable_d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test wine_fn_config_dll d3dcompiler_33 enable_d3dcompiler_33 wine_fn_config_dll d3dcompiler_34 enable_d3dcompiler_34 @@ -18549,12 +18487,12 @@ wine_fn_config_dll d3dcompiler_39 enable_d3dcompiler_39 wine_fn_config_dll d3dcompiler_40 enable_d3dcompiler_40 wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 -wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler +wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_dll d3dim enable_d3dim -wine_fn_config_dll d3drm enable_d3drm implib +wine_fn_config_dll d3drm enable_d3drm wine_fn_config_test dlls/d3drm/tests d3drm_test wine_fn_config_dll d3dx10_33 enable_d3dx10_33 wine_fn_config_dll d3dx10_34 enable_d3dx10_34 @@ -18566,10 +18504,10 @@ wine_fn_config_dll d3dx10_39 enable_d3dx10_39 wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 -wine_fn_config_dll d3dx10_43 enable_d3dx10_43 implib d3dx10 +wine_fn_config_dll d3dx10_43 enable_d3dx10_43 wine_fn_config_test dlls/d3dx10_43/tests d3dx10_43_test wine_fn_config_dll d3dx11_42 enable_d3dx11_42 -wine_fn_config_dll d3dx11_43 enable_d3dx11_43 implib d3dx11 +wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_test dlls/d3dx11_43/tests d3dx11_43_test wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 @@ -18583,7 +18521,7 @@ wine_fn_config_dll d3dx9_32 enable_d3dx9_32 wine_fn_config_dll d3dx9_33 enable_d3dx9_33 wine_fn_config_dll d3dx9_34 enable_d3dx9_34 wine_fn_config_dll d3dx9_35 enable_d3dx9_35 -wine_fn_config_dll d3dx9_36 enable_d3dx9_36 implib d3dx9 +wine_fn_config_dll d3dx9_36 enable_d3dx9_36 wine_fn_config_test dlls/d3dx9_36/tests d3dx9_36_test wine_fn_config_dll d3dx9_37 enable_d3dx9_37 wine_fn_config_dll d3dx9_38 enable_d3dx9_38 @@ -18592,14 +18530,14 @@ wine_fn_config_dll d3dx9_40 enable_d3dx9_40 wine_fn_config_dll d3dx9_41 enable_d3dx9_41 wine_fn_config_dll d3dx9_42 enable_d3dx9_42 wine_fn_config_dll d3dx9_43 enable_d3dx9_43 -wine_fn_config_dll d3dxof enable_d3dxof implib +wine_fn_config_dll d3dxof enable_d3dxof wine_fn_config_test dlls/d3dxof/tests d3dxof_test wine_fn_config_dll davclnt enable_davclnt -wine_fn_config_dll dbgeng enable_dbgeng implib -wine_fn_config_dll dbghelp enable_dbghelp implib -wine_fn_config_dll dciman32 enable_dciman32 implib +wine_fn_config_dll dbgeng enable_dbgeng +wine_fn_config_dll dbghelp enable_dbghelp +wine_fn_config_dll dciman32 enable_dciman32 wine_fn_config_dll ddeml.dll16 enable_win16 -wine_fn_config_dll ddraw enable_ddraw implib +wine_fn_config_dll ddraw enable_ddraw wine_fn_config_test dlls/ddraw/tests ddraw_test wine_fn_config_dll ddrawex enable_ddrawex wine_fn_config_test dlls/ddrawex/tests ddrawex_test @@ -18608,9 +18546,9 @@ wine_fn_config_test dlls/devenum/tests devenum_test wine_fn_config_dll dhcpcsvc enable_dhcpcsvc wine_fn_config_dll dhtmled.ocx enable_dhtmled_ocx wine_fn_config_dll difxapi enable_difxapi -wine_fn_config_dll dinput enable_dinput implib,staticimplib +wine_fn_config_dll dinput enable_dinput wine_fn_config_test dlls/dinput/tests dinput_test -wine_fn_config_dll dinput8 enable_dinput8 implib +wine_fn_config_dll dinput8 enable_dinput8 wine_fn_config_test dlls/dinput8/tests dinput8_test wine_fn_config_dll dispdib.dll16 enable_win16 wine_fn_config_dll dispex enable_dispex @@ -18633,13 +18571,13 @@ wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic wine_fn_config_test dlls/dmusic/tests dmusic_test wine_fn_config_dll dmusic32 enable_dmusic32 -wine_fn_config_dll dnsapi enable_dnsapi implib +wine_fn_config_dll dnsapi enable_dnsapi wine_fn_config_test dlls/dnsapi/tests dnsapi_test wine_fn_config_dll dplay enable_dplay -wine_fn_config_dll dplayx enable_dplayx implib +wine_fn_config_dll dplayx enable_dplayx wine_fn_config_test dlls/dplayx/tests dplayx_test wine_fn_config_dll dpnaddr enable_dpnaddr -wine_fn_config_dll dpnet enable_dpnet implib +wine_fn_config_dll dpnet enable_dpnet wine_fn_config_test dlls/dpnet/tests dpnet_test wine_fn_config_dll dpnhpast enable_dpnhpast wine_fn_config_dll dpnlobby enable_dpnlobby @@ -18647,22 +18585,22 @@ wine_fn_config_dll dpvoice enable_dpvoice wine_fn_config_test dlls/dpvoice/tests dpvoice_test wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien -wine_fn_config_dll dsound enable_dsound implib +wine_fn_config_dll dsound enable_dsound wine_fn_config_test dlls/dsound/tests dsound_test wine_fn_config_dll dsquery enable_dsquery wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave wine_fn_config_test dlls/dswave/tests dswave_test -wine_fn_config_dll dwmapi enable_dwmapi implib -wine_fn_config_dll dwrite enable_dwrite implib +wine_fn_config_dll dwmapi enable_dwmapi +wine_fn_config_dll dwrite enable_dwrite wine_fn_config_test dlls/dwrite/tests dwrite_test wine_fn_config_dll dx8vb enable_dx8vb wine_fn_config_dll dxdiagn enable_dxdiagn wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 wine_fn_config_lib dxerr9 -wine_fn_config_dll dxgi enable_dxgi implib +wine_fn_config_dll dxgi enable_dxgi wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid wine_fn_config_dll dxva2 enable_dxva2 @@ -18694,7 +18632,7 @@ wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_dll ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 -wine_fn_config_dll faultrep enable_faultrep implib +wine_fn_config_dll faultrep enable_faultrep wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fltmgr.sys enable_fltmgr_sys @@ -18706,37 +18644,37 @@ wine_fn_config_dll fwpuclnt enable_fwpuclnt wine_fn_config_dll gameux enable_gameux wine_fn_config_test dlls/gameux/tests gameux_test wine_fn_config_dll gdi.exe16 enable_win16 -wine_fn_config_dll gdi32 enable_gdi32 implib +wine_fn_config_dll gdi32 enable_gdi32 wine_fn_config_test dlls/gdi32/tests gdi32_test -wine_fn_config_dll gdiplus enable_gdiplus implib +wine_fn_config_dll gdiplus enable_gdiplus wine_fn_config_test dlls/gdiplus/tests gdiplus_test -wine_fn_config_dll glu32 enable_glu32 implib +wine_fn_config_dll glu32 enable_glu32 wine_fn_config_dll gphoto2.ds enable_gphoto2_ds wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal -wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx implib htmlhelp -wine_fn_config_dll hid enable_hid implib +wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx +wine_fn_config_dll hid enable_hid wine_fn_config_test dlls/hid/tests hid_test -wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass -wine_fn_config_dll hlink enable_hlink implib +wine_fn_config_dll hidclass.sys enable_hidclass_sys +wine_fn_config_dll hlink enable_hlink wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg wine_fn_config_test dlls/hnetcfg/tests hnetcfg_test -wine_fn_config_dll httpapi enable_httpapi implib +wine_fn_config_dll httpapi enable_httpapi wine_fn_config_test dlls/httpapi/tests httpapi_test wine_fn_config_dll iccvid enable_iccvid wine_fn_config_dll icmp enable_icmp -wine_fn_config_dll ieframe enable_ieframe implib +wine_fn_config_dll ieframe enable_ieframe wine_fn_config_test dlls/ieframe/tests ieframe_test wine_fn_config_dll ieproxy enable_ieproxy wine_fn_config_dll ifsmgr.vxd enable_win16 wine_fn_config_dll imaadp32.acm enable_imaadp32_acm -wine_fn_config_dll imagehlp enable_imagehlp implib +wine_fn_config_dll imagehlp enable_imagehlp wine_fn_config_test dlls/imagehlp/tests imagehlp_test wine_fn_config_dll imm.dll16 enable_win16 -wine_fn_config_dll imm32 enable_imm32 implib +wine_fn_config_dll imm32 enable_imm32 wine_fn_config_test dlls/imm32/tests imm32_test -wine_fn_config_dll inetcomm enable_inetcomm implib +wine_fn_config_dll inetcomm enable_inetcomm wine_fn_config_test dlls/inetcomm/tests inetcomm_test wine_fn_config_dll inetcpl.cpl enable_inetcpl_cpl wine_fn_config_dll inetmib1 enable_inetmib1 @@ -18746,7 +18684,7 @@ wine_fn_config_test dlls/infosoft/tests infosoft_test wine_fn_config_dll initpki enable_initpki wine_fn_config_dll inkobj enable_inkobj wine_fn_config_dll inseng enable_inseng -wine_fn_config_dll iphlpapi enable_iphlpapi implib +wine_fn_config_dll iphlpapi enable_iphlpapi wine_fn_config_test dlls/iphlpapi/tests iphlpapi_test wine_fn_config_dll iprop enable_iprop wine_fn_config_dll irprops.cpl enable_irprops_cpl @@ -18756,26 +18694,26 @@ wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll joy.cpl enable_joy_cpl wine_fn_config_dll jscript enable_jscript wine_fn_config_test dlls/jscript/tests jscript_test -wine_fn_config_dll jsproxy enable_jsproxy implib +wine_fn_config_dll jsproxy enable_jsproxy wine_fn_config_test dlls/jsproxy/tests jsproxy_test wine_fn_config_dll kerberos enable_kerberos -wine_fn_config_dll kernel32 enable_kernel32 implib +wine_fn_config_dll kernel32 enable_kernel32 wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll kernelbase enable_kernelbase wine_fn_config_dll keyboard.drv16 enable_win16 -wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel +wine_fn_config_dll krnl386.exe16 enable_win16 wine_fn_config_dll ksuser enable_ksuser wine_fn_config_dll ktmw32 enable_ktmw32 wine_fn_config_dll l3codeca.acm enable_l3codeca_acm -wine_fn_config_dll loadperf enable_loadperf implib +wine_fn_config_dll loadperf enable_loadperf wine_fn_config_dll localspl enable_localspl wine_fn_config_test dlls/localspl/tests localspl_test wine_fn_config_dll localui enable_localui wine_fn_config_test dlls/localui/tests localui_test -wine_fn_config_dll lz32 enable_lz32 implib +wine_fn_config_dll lz32 enable_lz32 wine_fn_config_test dlls/lz32/tests lz32_test wine_fn_config_dll lzexpand.dll16 enable_win16 -wine_fn_config_dll mapi32 enable_mapi32 implib +wine_fn_config_dll mapi32 enable_mapi32 wine_fn_config_test dlls/mapi32/tests mapi32_test wine_fn_config_dll mapistub enable_mapistub wine_fn_config_dll mciavi32 enable_mciavi32 @@ -18783,16 +18721,16 @@ wine_fn_config_dll mcicda enable_mcicda wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave -wine_fn_config_dll mf enable_mf implib +wine_fn_config_dll mf enable_mf wine_fn_config_test dlls/mf/tests mf_test wine_fn_config_dll mf3216 enable_mf3216 -wine_fn_config_dll mfplat enable_mfplat implib +wine_fn_config_dll mfplat enable_mfplat wine_fn_config_test dlls/mfplat/tests mfplat_test wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_lib mfuuid wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap -wine_fn_config_dll mlang enable_mlang implib +wine_fn_config_dll mlang enable_mlang wine_fn_config_test dlls/mlang/tests mlang_test wine_fn_config_dll mmcndmgr enable_mmcndmgr wine_fn_config_test dlls/mmcndmgr/tests mmcndmgr_test @@ -18803,17 +18741,17 @@ wine_fn_config_dll mmsystem.dll16 enable_win16 wine_fn_config_dll monodebg.vxd enable_win16 wine_fn_config_dll mountmgr.sys enable_mountmgr_sys wine_fn_config_dll mouse.drv16 enable_win16 -wine_fn_config_dll mpr enable_mpr implib +wine_fn_config_dll mpr enable_mpr wine_fn_config_test dlls/mpr/tests mpr_test -wine_fn_config_dll mprapi enable_mprapi implib +wine_fn_config_dll mprapi enable_mprapi wine_fn_config_dll msacm.dll16 enable_win16 wine_fn_config_dll msacm32.drv enable_msacm32_drv -wine_fn_config_dll msacm32 enable_msacm32 implib +wine_fn_config_dll msacm32 enable_msacm32 wine_fn_config_test dlls/msacm32/tests msacm32_test wine_fn_config_dll msadp32.acm enable_msadp32_acm -wine_fn_config_dll msasn1 enable_msasn1 implib +wine_fn_config_dll msasn1 enable_msasn1 wine_fn_config_dll mscat32 enable_mscat32 -wine_fn_config_dll mscms enable_mscms implib +wine_fn_config_dll mscms enable_mscms wine_fn_config_test dlls/mscms/tests mscms_test wine_fn_config_dll mscoree enable_mscoree wine_fn_config_test dlls/mscoree/tests mscoree_test @@ -18822,26 +18760,26 @@ wine_fn_config_test dlls/msctf/tests msctf_test wine_fn_config_dll msctfp enable_msctfp wine_fn_config_dll msdaps enable_msdaps wine_fn_config_dll msdelta enable_msdelta -wine_fn_config_dll msdmo enable_msdmo implib +wine_fn_config_dll msdmo enable_msdmo wine_fn_config_test dlls/msdmo/tests msdmo_test wine_fn_config_dll msdrm enable_msdrm wine_fn_config_dll msftedit enable_msftedit wine_fn_config_dll msg711.acm enable_msg711_acm wine_fn_config_dll msgsm32.acm enable_msgsm32_acm wine_fn_config_dll mshtml.tlb enable_mshtml_tlb -wine_fn_config_dll mshtml enable_mshtml implib +wine_fn_config_dll mshtml enable_mshtml wine_fn_config_test dlls/mshtml/tests mshtml_test -wine_fn_config_dll msi enable_msi implib +wine_fn_config_dll msi enable_msi wine_fn_config_test dlls/msi/tests msi_test wine_fn_config_dll msident enable_msident -wine_fn_config_dll msimg32 enable_msimg32 implib +wine_fn_config_dll msimg32 enable_msimg32 wine_fn_config_dll msimsg enable_msimsg wine_fn_config_dll msimtf enable_msimtf wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 -wine_fn_config_dll mspatcha enable_mspatcha implib +wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msports enable_msports wine_fn_config_dll msrle32 enable_msrle32 wine_fn_config_test dlls/msrle32/tests msrle32_test @@ -18871,28 +18809,28 @@ wine_fn_config_dll msvcp71 enable_msvcp71 wine_fn_config_dll msvcp80 enable_msvcp80 wine_fn_config_dll msvcp90 enable_msvcp90 wine_fn_config_test dlls/msvcp90/tests msvcp90_test -wine_fn_config_dll msvcr100 enable_msvcr100 implib +wine_fn_config_dll msvcr100 enable_msvcr100 wine_fn_config_test dlls/msvcr100/tests msvcr100_test -wine_fn_config_dll msvcr110 enable_msvcr110 implib -wine_fn_config_dll msvcr120 enable_msvcr120 implib +wine_fn_config_dll msvcr110 enable_msvcr110 +wine_fn_config_dll msvcr120 enable_msvcr120 wine_fn_config_test dlls/msvcr120/tests msvcr120_test wine_fn_config_dll msvcr120_app enable_msvcr120_app -wine_fn_config_dll msvcr70 enable_msvcr70 implib -wine_fn_config_dll msvcr71 enable_msvcr71 implib -wine_fn_config_dll msvcr80 enable_msvcr80 implib -wine_fn_config_dll msvcr90 enable_msvcr90 implib +wine_fn_config_dll msvcr70 enable_msvcr70 +wine_fn_config_dll msvcr71 enable_msvcr71 +wine_fn_config_dll msvcr80 enable_msvcr80 +wine_fn_config_dll msvcr90 enable_msvcr90 wine_fn_config_test dlls/msvcr90/tests msvcr90_test -wine_fn_config_dll msvcrt enable_msvcrt implib +wine_fn_config_dll msvcrt enable_msvcrt wine_fn_config_test dlls/msvcrt/tests msvcrt_test wine_fn_config_dll msvcrt20 enable_msvcrt20 wine_fn_config_dll msvcrt40 enable_msvcrt40 -wine_fn_config_dll msvcrtd enable_msvcrtd implib +wine_fn_config_dll msvcrtd enable_msvcrtd wine_fn_config_test dlls/msvcrtd/tests msvcrtd_test -wine_fn_config_dll msvfw32 enable_msvfw32 implib +wine_fn_config_dll msvfw32 enable_msvfw32 wine_fn_config_test dlls/msvfw32/tests msvfw32_test wine_fn_config_dll msvidc32 enable_msvidc32 wine_fn_config_dll msvideo.dll16 enable_win16 -wine_fn_config_dll mswsock enable_mswsock implib +wine_fn_config_dll mswsock enable_mswsock wine_fn_config_dll msxml enable_msxml wine_fn_config_dll msxml2 enable_msxml2 wine_fn_config_dll msxml3 enable_msxml3 @@ -18901,28 +18839,28 @@ wine_fn_config_dll msxml4 enable_msxml4 wine_fn_config_dll msxml6 enable_msxml6 wine_fn_config_dll mtxdm enable_mtxdm wine_fn_config_dll ncrypt enable_ncrypt -wine_fn_config_dll nddeapi enable_nddeapi implib +wine_fn_config_dll nddeapi enable_nddeapi wine_fn_config_dll ndis.sys enable_ndis_sys -wine_fn_config_dll netapi32 enable_netapi32 implib +wine_fn_config_dll netapi32 enable_netapi32 wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx wine_fn_config_test dlls/netcfgx/tests netcfgx_test wine_fn_config_dll netprofm enable_netprofm wine_fn_config_test dlls/netprofm/tests netprofm_test -wine_fn_config_dll newdev enable_newdev implib -wine_fn_config_dll normaliz enable_normaliz implib +wine_fn_config_dll newdev enable_newdev +wine_fn_config_dll normaliz enable_normaliz wine_fn_config_dll npmshtml enable_npmshtml wine_fn_config_dll npptools enable_npptools -wine_fn_config_dll ntdll enable_ntdll implib +wine_fn_config_dll ntdll enable_ntdll wine_fn_config_test dlls/ntdll/tests ntdll_test -wine_fn_config_dll ntdsapi enable_ntdsapi implib +wine_fn_config_dll ntdsapi enable_ntdsapi wine_fn_config_test dlls/ntdsapi/tests ntdsapi_test -wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe implib ntoskrnl +wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe wine_fn_config_dll ntprint enable_ntprint wine_fn_config_test dlls/ntprint/tests ntprint_test wine_fn_config_dll objsel enable_objsel -wine_fn_config_dll odbc32 enable_odbc32 implib -wine_fn_config_dll odbccp32 enable_odbccp32 implib +wine_fn_config_dll odbc32 enable_odbc32 +wine_fn_config_dll odbccp32 enable_odbccp32 wine_fn_config_test dlls/odbccp32/tests odbccp32_test wine_fn_config_dll odbccu32 enable_odbccu32 wine_fn_config_dll ole2.dll16 enable_win16 @@ -18931,38 +18869,38 @@ wine_fn_config_dll ole2disp.dll16 enable_win16 wine_fn_config_dll ole2nls.dll16 enable_win16 wine_fn_config_dll ole2prox.dll16 enable_win16 wine_fn_config_dll ole2thk.dll16 enable_win16 -wine_fn_config_dll ole32 enable_ole32 implib +wine_fn_config_dll ole32 enable_ole32 wine_fn_config_test dlls/ole32/tests ole32_test -wine_fn_config_dll oleacc enable_oleacc implib +wine_fn_config_dll oleacc enable_oleacc wine_fn_config_test dlls/oleacc/tests oleacc_test -wine_fn_config_dll oleaut32 enable_oleaut32 implib +wine_fn_config_dll oleaut32 enable_oleaut32 wine_fn_config_test dlls/oleaut32/tests oleaut32_test wine_fn_config_dll olecli.dll16 enable_win16 -wine_fn_config_dll olecli32 enable_olecli32 implib +wine_fn_config_dll olecli32 enable_olecli32 wine_fn_config_dll oledb32 enable_oledb32 wine_fn_config_test dlls/oledb32/tests oledb32_test -wine_fn_config_dll oledlg enable_oledlg implib +wine_fn_config_dll oledlg enable_oledlg wine_fn_config_test dlls/oledlg/tests oledlg_test -wine_fn_config_dll olepro32 enable_olepro32 implib +wine_fn_config_dll olepro32 enable_olepro32 wine_fn_config_dll olesvr.dll16 enable_win16 -wine_fn_config_dll olesvr32 enable_olesvr32 implib +wine_fn_config_dll olesvr32 enable_olesvr32 wine_fn_config_dll olethk32 enable_olethk32 wine_fn_config_dll openal32 enable_openal32 wine_fn_config_dll opencl enable_opencl -wine_fn_config_dll opengl32 enable_opengl32 implib +wine_fn_config_dll opengl32 enable_opengl32 wine_fn_config_test dlls/opengl32/tests opengl32_test wine_fn_config_dll packager enable_packager wine_fn_config_test dlls/packager/tests packager_test -wine_fn_config_dll pdh enable_pdh implib +wine_fn_config_dll pdh enable_pdh wine_fn_config_test dlls/pdh/tests pdh_test wine_fn_config_dll photometadatahandler enable_photometadatahandler wine_fn_config_dll pidgen enable_pidgen -wine_fn_config_dll powrprof enable_powrprof implib +wine_fn_config_dll powrprof enable_powrprof wine_fn_config_dll printui enable_printui wine_fn_config_dll prntvpt enable_prntvpt -wine_fn_config_dll propsys enable_propsys implib +wine_fn_config_dll propsys enable_propsys wine_fn_config_test dlls/propsys/tests propsys_test -wine_fn_config_dll psapi enable_psapi implib +wine_fn_config_dll psapi enable_psapi wine_fn_config_test dlls/psapi/tests psapi_test wine_fn_config_dll pstorec enable_pstorec wine_fn_config_test dlls/pstorec/tests pstorec_test @@ -18973,26 +18911,26 @@ wine_fn_config_test dlls/qedit/tests qedit_test wine_fn_config_dll qmgr enable_qmgr wine_fn_config_test dlls/qmgr/tests qmgr_test wine_fn_config_dll qmgrprxy enable_qmgrprxy -wine_fn_config_dll quartz enable_quartz implib +wine_fn_config_dll quartz enable_quartz wine_fn_config_test dlls/quartz/tests quartz_test wine_fn_config_dll query enable_query wine_fn_config_dll rasapi16.dll16 enable_win16 -wine_fn_config_dll rasapi32 enable_rasapi32 implib +wine_fn_config_dll rasapi32 enable_rasapi32 wine_fn_config_test dlls/rasapi32/tests rasapi32_test -wine_fn_config_dll rasdlg enable_rasdlg implib +wine_fn_config_dll rasdlg enable_rasdlg wine_fn_config_dll regapi enable_regapi -wine_fn_config_dll resutils enable_resutils implib -wine_fn_config_dll riched20 enable_riched20 implib +wine_fn_config_dll resutils enable_resutils +wine_fn_config_dll riched20 enable_riched20 wine_fn_config_test dlls/riched20/tests riched20_test wine_fn_config_dll riched32 enable_riched32 wine_fn_config_test dlls/riched32/tests riched32_test -wine_fn_config_dll rpcrt4 enable_rpcrt4 implib +wine_fn_config_dll rpcrt4 enable_rpcrt4 wine_fn_config_test dlls/rpcrt4/tests rpcrt4_test wine_fn_config_dll rsabase enable_rsabase -wine_fn_config_dll rsaenh enable_rsaenh implib +wine_fn_config_dll rsaenh enable_rsaenh wine_fn_config_test dlls/rsaenh/tests rsaenh_test wine_fn_config_dll rstrtmgr enable_rstrtmgr -wine_fn_config_dll rtutils enable_rtutils implib +wine_fn_config_dll rtutils enable_rtutils wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds wine_fn_config_dll sapi enable_sapi @@ -19007,52 +18945,52 @@ wine_fn_config_dll scrobj enable_scrobj wine_fn_config_dll scrrun enable_scrrun wine_fn_config_test dlls/scrrun/tests scrrun_test wine_fn_config_dll scsiport.sys enable_scsiport_sys -wine_fn_config_dll secur32 enable_secur32 implib +wine_fn_config_dll secur32 enable_secur32 wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security -wine_fn_config_dll sensapi enable_sensapi implib +wine_fn_config_dll sensapi enable_sensapi wine_fn_config_dll serialui enable_serialui wine_fn_config_test dlls/serialui/tests serialui_test -wine_fn_config_dll setupapi enable_setupapi implib +wine_fn_config_dll setupapi enable_setupapi wine_fn_config_test dlls/setupapi/tests setupapi_test wine_fn_config_dll setupx.dll16 enable_win16 -wine_fn_config_dll sfc enable_sfc implib -wine_fn_config_dll sfc_os enable_sfc_os implib +wine_fn_config_dll sfc enable_sfc +wine_fn_config_dll sfc_os enable_sfc_os wine_fn_config_dll shcore enable_shcore wine_fn_config_dll shdoclc enable_shdoclc -wine_fn_config_dll shdocvw enable_shdocvw implib +wine_fn_config_dll shdocvw enable_shdocvw wine_fn_config_test dlls/shdocvw/tests shdocvw_test wine_fn_config_dll shell.dll16 enable_win16 -wine_fn_config_dll shell32 enable_shell32 implib +wine_fn_config_dll shell32 enable_shell32 wine_fn_config_test dlls/shell32/tests shell32_test -wine_fn_config_dll shfolder enable_shfolder implib -wine_fn_config_dll shlwapi enable_shlwapi implib +wine_fn_config_dll shfolder enable_shfolder +wine_fn_config_dll shlwapi enable_shlwapi wine_fn_config_test dlls/shlwapi/tests shlwapi_test wine_fn_config_dll slbcsp enable_slbcsp -wine_fn_config_dll slc enable_slc implib +wine_fn_config_dll slc enable_slc wine_fn_config_test dlls/slc/tests slc_test -wine_fn_config_dll snmpapi enable_snmpapi implib +wine_fn_config_dll snmpapi enable_snmpapi wine_fn_config_test dlls/snmpapi/tests snmpapi_test wine_fn_config_dll softpub enable_softpub wine_fn_config_dll sound.drv16 enable_win16 -wine_fn_config_dll spoolss enable_spoolss implib +wine_fn_config_dll spoolss enable_spoolss wine_fn_config_test dlls/spoolss/tests spoolss_test wine_fn_config_dll sspicli enable_sspicli wine_fn_config_dll stdole2.tlb enable_stdole2_tlb wine_fn_config_dll stdole32.tlb enable_stdole32_tlb -wine_fn_config_dll sti enable_sti implib +wine_fn_config_dll sti enable_sti wine_fn_config_test dlls/sti/tests sti_test wine_fn_config_dll storage.dll16 enable_win16 wine_fn_config_dll stress.dll16 enable_win16 wine_fn_config_lib strmbase wine_fn_config_lib strmiids wine_fn_config_dll svrapi enable_svrapi -wine_fn_config_dll sxs enable_sxs implib +wine_fn_config_dll sxs enable_sxs wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 -wine_fn_config_dll t2embed enable_t2embed implib +wine_fn_config_dll t2embed enable_t2embed wine_fn_config_test dlls/t2embed/tests t2embed_test -wine_fn_config_dll tapi32 enable_tapi32 implib +wine_fn_config_dll tapi32 enable_tapi32 wine_fn_config_dll taskschd enable_taskschd wine_fn_config_test dlls/taskschd/tests taskschd_test wine_fn_config_dll tdh enable_tdh @@ -19063,25 +19001,25 @@ wine_fn_config_dll twain.dll16 enable_win16 wine_fn_config_dll twain_32 enable_twain_32 wine_fn_config_test dlls/twain_32/tests twain_32_test wine_fn_config_dll typelib.dll16 enable_win16 -wine_fn_config_dll ucrtbase enable_ucrtbase implib +wine_fn_config_dll ucrtbase enable_ucrtbase wine_fn_config_test dlls/ucrtbase/tests ucrtbase_test wine_fn_config_dll uiautomationcore enable_uiautomationcore wine_fn_config_dll uiribbon enable_uiribbon -wine_fn_config_dll unicows enable_unicows implib +wine_fn_config_dll unicows enable_unicows wine_fn_config_dll updspapi enable_updspapi -wine_fn_config_dll url enable_url implib -wine_fn_config_dll urlmon enable_urlmon implib +wine_fn_config_dll url enable_url +wine_fn_config_dll urlmon enable_urlmon wine_fn_config_test dlls/urlmon/tests urlmon_test -wine_fn_config_dll usbd.sys enable_usbd_sys implib usbd +wine_fn_config_dll usbd.sys enable_usbd_sys wine_fn_config_dll user.exe16 enable_win16 -wine_fn_config_dll user32 enable_user32 implib +wine_fn_config_dll user32 enable_user32 wine_fn_config_test dlls/user32/tests user32_test -wine_fn_config_dll userenv enable_userenv implib +wine_fn_config_dll userenv enable_userenv wine_fn_config_test dlls/userenv/tests userenv_test -wine_fn_config_dll usp10 enable_usp10 implib +wine_fn_config_dll usp10 enable_usp10 wine_fn_config_test dlls/usp10/tests usp10_test wine_fn_config_lib uuid -wine_fn_config_dll uxtheme enable_uxtheme implib +wine_fn_config_dll uxtheme enable_uxtheme wine_fn_config_test dlls/uxtheme/tests uxtheme_test wine_fn_config_dll vbscript enable_vbscript wine_fn_config_test dlls/vbscript/tests vbscript_test @@ -19094,9 +19032,9 @@ wine_fn_config_dll vcomp140 enable_vcomp140 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vcruntime140 enable_vcruntime140 wine_fn_config_dll vdhcp.vxd enable_win16 -wine_fn_config_dll vdmdbg enable_vdmdbg implib +wine_fn_config_dll vdmdbg enable_vdmdbg wine_fn_config_dll ver.dll16 enable_win16 -wine_fn_config_dll version enable_version implib +wine_fn_config_dll version enable_version wine_fn_config_test dlls/version/tests version_test wine_fn_config_dll virtdisk enable_virtdisk wine_fn_config_dll vmm.vxd enable_win16 @@ -19112,9 +19050,9 @@ wine_fn_config_test dlls/wbemdisp/tests wbemdisp_test wine_fn_config_dll wbemprox enable_wbemprox wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll wdscore enable_wdscore -wine_fn_config_dll webservices enable_webservices implib +wine_fn_config_dll webservices enable_webservices wine_fn_config_test dlls/webservices/tests webservices_test -wine_fn_config_dll wer enable_wer implib +wine_fn_config_dll wer enable_wer wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc @@ -19124,16 +19062,16 @@ wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 wine_fn_config_dll windebug.dll16 enable_win16 -wine_fn_config_dll windowscodecs enable_windowscodecs implib +wine_fn_config_dll windowscodecs enable_windowscodecs wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test -wine_fn_config_dll windowscodecsext enable_windowscodecsext implib +wine_fn_config_dll windowscodecsext enable_windowscodecsext wine_fn_config_test dlls/windowscodecsext/tests windowscodecsext_test wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll wineandroid.drv enable_wineandroid_drv wine_fn_config_dll winebus.sys enable_winebus_sys wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 -wine_fn_config_dll wined3d enable_wined3d implib +wine_fn_config_dll wined3d enable_wined3d wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winehid.sys enable_winehid_sys wine_fn_config_dll winejoystick.drv enable_winejoystick_drv @@ -19147,28 +19085,28 @@ wine_fn_config_dll wineqtdecoder enable_wineqtdecoder wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 -wine_fn_config_dll winhttp enable_winhttp implib +wine_fn_config_dll winhttp enable_winhttp wine_fn_config_test dlls/winhttp/tests winhttp_test -wine_fn_config_dll wininet enable_wininet implib +wine_fn_config_dll wininet enable_wininet wine_fn_config_test dlls/wininet/tests wininet_test -wine_fn_config_dll winmm enable_winmm implib +wine_fn_config_dll winmm enable_winmm wine_fn_config_test dlls/winmm/tests winmm_test wine_fn_config_dll winnls.dll16 enable_win16 -wine_fn_config_dll winnls32 enable_winnls32 implib -wine_fn_config_dll winscard enable_winscard implib +wine_fn_config_dll winnls32 enable_winnls32 +wine_fn_config_dll winscard enable_winscard wine_fn_config_dll winsock.dll16 enable_win16 -wine_fn_config_dll winspool.drv enable_winspool_drv implib winspool +wine_fn_config_dll winspool.drv enable_winspool_drv wine_fn_config_test dlls/winspool.drv/tests winspool.drv_test wine_fn_config_dll winsta enable_winsta wine_fn_config_dll wintab.dll16 enable_win16 -wine_fn_config_dll wintab32 enable_wintab32 implib +wine_fn_config_dll wintab32 enable_wintab32 wine_fn_config_test dlls/wintab32/tests wintab32_test -wine_fn_config_dll wintrust enable_wintrust implib +wine_fn_config_dll wintrust enable_wintrust wine_fn_config_test dlls/wintrust/tests wintrust_test wine_fn_config_dll winusb enable_winusb -wine_fn_config_dll wlanapi enable_wlanapi implib +wine_fn_config_dll wlanapi enable_wlanapi wine_fn_config_test dlls/wlanapi/tests wlanapi_test -wine_fn_config_dll wldap32 enable_wldap32 implib +wine_fn_config_dll wldap32 enable_wldap32 wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmasf enable_wmasf wine_fn_config_dll wmi enable_wmi @@ -19177,23 +19115,23 @@ wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmphoto enable_wmphoto -wine_fn_config_dll wmvcore enable_wmvcore implib +wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_test dlls/wmvcore/tests wmvcore_test -wine_fn_config_dll wnaspi32 enable_wnaspi32 implib -wine_fn_config_dll wow32 enable_win16 implib +wine_fn_config_dll wnaspi32 enable_wnaspi32 +wine_fn_config_dll wow32 enable_win16 wine_fn_config_dll wpc enable_wpc wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap -wine_fn_config_dll ws2_32 enable_ws2_32 implib +wine_fn_config_dll ws2_32 enable_ws2_32 wine_fn_config_test dlls/ws2_32/tests ws2_32_test -wine_fn_config_dll wsdapi enable_wsdapi implib +wine_fn_config_dll wsdapi enable_wsdapi wine_fn_config_test dlls/wsdapi/tests wsdapi_test wine_fn_config_dll wshom.ocx enable_wshom_ocx wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test -wine_fn_config_dll wsnmp32 enable_wsnmp32 implib +wine_fn_config_dll wsnmp32 enable_wsnmp32 wine_fn_config_test dlls/wsnmp32/tests wsnmp32_test -wine_fn_config_dll wsock32 enable_wsock32 implib -wine_fn_config_dll wtsapi32 enable_wtsapi32 implib +wine_fn_config_dll wsock32 enable_wsock32 +wine_fn_config_dll wtsapi32 enable_wtsapi32 wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi wine_fn_config_dll wuaueng enable_wuaueng @@ -19223,11 +19161,11 @@ wine_fn_config_dll xaudio2_8 enable_xaudio2_8 wine_fn_config_dll xaudio2_9 enable_xaudio2_9 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 -wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput +wine_fn_config_dll xinput1_3 enable_xinput1_3 wine_fn_config_test dlls/xinput1_3/tests xinput1_3_test wine_fn_config_dll xinput1_4 enable_xinput1_4 wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 -wine_fn_config_dll xmllite enable_xmllite implib +wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_dll xpsprint enable_xpsprint diff --git a/configure.ac b/configure.ac index 762c10167d0..cd7a785e5cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2798,16 +2798,16 @@ WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) WINE_CONFIG_DLL(acledit) -WINE_CONFIG_DLL(aclui,,[implib]) -WINE_CONFIG_DLL(activeds,,[implib]) +WINE_CONFIG_DLL(aclui) +WINE_CONFIG_DLL(activeds) WINE_CONFIG_DLL(actxprxy) WINE_CONFIG_LIB(adsiid) WINE_CONFIG_DLL(adsldp) WINE_CONFIG_TEST(dlls/adsldp/tests) WINE_CONFIG_DLL(adsldpc) -WINE_CONFIG_DLL(advapi32,,[implib]) +WINE_CONFIG_DLL(advapi32) WINE_CONFIG_TEST(dlls/advapi32/tests) -WINE_CONFIG_DLL(advpack,,[implib]) +WINE_CONFIG_DLL(advpack) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) @@ -3011,79 +3011,79 @@ WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl) -WINE_CONFIG_DLL(atl,,[implib]) +WINE_CONFIG_DLL(atl) WINE_CONFIG_TEST(dlls/atl/tests) -WINE_CONFIG_DLL(atl100,,[implib]) +WINE_CONFIG_DLL(atl100) WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl110) -WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_DLL(atl80) WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(atl90) WINE_CONFIG_DLL(authz) -WINE_CONFIG_DLL(avicap32,,[implib]) -WINE_CONFIG_DLL(avifil32,,[implib]) +WINE_CONFIG_DLL(avicap32) +WINE_CONFIG_DLL(avifil32) WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) -WINE_CONFIG_DLL(avrt,,[implib]) -WINE_CONFIG_DLL(bcrypt,,[implib]) +WINE_CONFIG_DLL(avrt) +WINE_CONFIG_DLL(bcrypt) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(bluetoothapis) WINE_CONFIG_DLL(browseui) WINE_CONFIG_TEST(dlls/browseui/tests) WINE_CONFIG_DLL(bthprops.cpl) -WINE_CONFIG_DLL(cabinet,,[implib]) +WINE_CONFIG_DLL(cabinet) WINE_CONFIG_TEST(dlls/cabinet/tests) -WINE_CONFIG_DLL(capi2032,,[implib]) -WINE_CONFIG_DLL(cards,,[implib]) +WINE_CONFIG_DLL(capi2032) +WINE_CONFIG_DLL(cards) WINE_CONFIG_DLL(cdosys) -WINE_CONFIG_DLL(cfgmgr32,,[implib]) -WINE_CONFIG_DLL(clusapi,,[implib]) +WINE_CONFIG_DLL(cfgmgr32) +WINE_CONFIG_DLL(clusapi) WINE_CONFIG_DLL(combase) WINE_CONFIG_TEST(dlls/combase/tests) WINE_CONFIG_DLL(comcat) WINE_CONFIG_TEST(dlls/comcat/tests) -WINE_CONFIG_DLL(comctl32,,[implib]) +WINE_CONFIG_DLL(comctl32) WINE_CONFIG_TEST(dlls/comctl32/tests) -WINE_CONFIG_DLL(comdlg32,,[implib]) +WINE_CONFIG_DLL(comdlg32) WINE_CONFIG_TEST(dlls/comdlg32/tests) WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) -WINE_CONFIG_DLL(compstui,,[implib]) -WINE_CONFIG_DLL(comsvcs,,[implib]) +WINE_CONFIG_DLL(compstui) +WINE_CONFIG_DLL(comsvcs) WINE_CONFIG_DLL(concrt140) WINE_CONFIG_DLL(connect) -WINE_CONFIG_DLL(credui,,[implib]) +WINE_CONFIG_DLL(credui) WINE_CONFIG_TEST(dlls/credui/tests) WINE_CONFIG_DLL(crtdll) -WINE_CONFIG_DLL(crypt32,,[implib]) +WINE_CONFIG_DLL(crypt32) WINE_CONFIG_TEST(dlls/crypt32/tests) WINE_CONFIG_DLL(cryptdlg) -WINE_CONFIG_DLL(cryptdll,,[implib]) +WINE_CONFIG_DLL(cryptdll) WINE_CONFIG_DLL(cryptext) -WINE_CONFIG_DLL(cryptnet,,[implib]) +WINE_CONFIG_DLL(cryptnet) WINE_CONFIG_TEST(dlls/cryptnet/tests) -WINE_CONFIG_DLL(cryptui,,[implib]) +WINE_CONFIG_DLL(cryptui) WINE_CONFIG_TEST(dlls/cryptui/tests) WINE_CONFIG_DLL(ctapi32) WINE_CONFIG_DLL(ctl3d.dll16,enable_win16) WINE_CONFIG_DLL(ctl3d32) WINE_CONFIG_DLL(ctl3dv2.dll16,enable_win16) -WINE_CONFIG_DLL(d2d1,,[implib]) +WINE_CONFIG_DLL(d2d1) WINE_CONFIG_TEST(dlls/d2d1/tests) -WINE_CONFIG_DLL(d3d10,,[implib]) +WINE_CONFIG_DLL(d3d10) WINE_CONFIG_TEST(dlls/d3d10/tests) -WINE_CONFIG_DLL(d3d10_1,,[implib]) +WINE_CONFIG_DLL(d3d10_1) WINE_CONFIG_TEST(dlls/d3d10_1/tests) -WINE_CONFIG_DLL(d3d10core,,[implib]) +WINE_CONFIG_DLL(d3d10core) WINE_CONFIG_TEST(dlls/d3d10core/tests) -WINE_CONFIG_DLL(d3d11,,[implib]) +WINE_CONFIG_DLL(d3d11) WINE_CONFIG_TEST(dlls/d3d11/tests) -WINE_CONFIG_DLL(d3d12,,[implib]) +WINE_CONFIG_DLL(d3d12) WINE_CONFIG_TEST(dlls/d3d12/tests) -WINE_CONFIG_DLL(d3d8,,[implib]) +WINE_CONFIG_DLL(d3d8) WINE_CONFIG_TEST(dlls/d3d8/tests) -WINE_CONFIG_DLL(d3d9,,[implib]) +WINE_CONFIG_DLL(d3d9) WINE_CONFIG_TEST(dlls/d3d9/tests) WINE_CONFIG_DLL(d3dcompiler_33) WINE_CONFIG_DLL(d3dcompiler_34) @@ -3095,12 +3095,12 @@ WINE_CONFIG_DLL(d3dcompiler_39) WINE_CONFIG_DLL(d3dcompiler_40) WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) -WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) +WINE_CONFIG_DLL(d3dcompiler_43) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dcompiler_47) WINE_CONFIG_DLL(d3dim) -WINE_CONFIG_DLL(d3drm,,[implib]) +WINE_CONFIG_DLL(d3drm) WINE_CONFIG_TEST(dlls/d3drm/tests) WINE_CONFIG_DLL(d3dx10_33) WINE_CONFIG_DLL(d3dx10_34) @@ -3112,10 +3112,10 @@ WINE_CONFIG_DLL(d3dx10_39) WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) -WINE_CONFIG_DLL(d3dx10_43,,[implib],[d3dx10]) +WINE_CONFIG_DLL(d3dx10_43) WINE_CONFIG_TEST(dlls/d3dx10_43/tests) WINE_CONFIG_DLL(d3dx11_42) -WINE_CONFIG_DLL(d3dx11_43,,[implib],[d3dx11]) +WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_TEST(dlls/d3dx11_43/tests) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) @@ -3129,7 +3129,7 @@ WINE_CONFIG_DLL(d3dx9_32) WINE_CONFIG_DLL(d3dx9_33) WINE_CONFIG_DLL(d3dx9_34) WINE_CONFIG_DLL(d3dx9_35) -WINE_CONFIG_DLL(d3dx9_36,,[implib],[d3dx9]) +WINE_CONFIG_DLL(d3dx9_36) WINE_CONFIG_TEST(dlls/d3dx9_36/tests) WINE_CONFIG_DLL(d3dx9_37) WINE_CONFIG_DLL(d3dx9_38) @@ -3138,14 +3138,14 @@ WINE_CONFIG_DLL(d3dx9_40) WINE_CONFIG_DLL(d3dx9_41) WINE_CONFIG_DLL(d3dx9_42) WINE_CONFIG_DLL(d3dx9_43) -WINE_CONFIG_DLL(d3dxof,,[implib]) +WINE_CONFIG_DLL(d3dxof) WINE_CONFIG_TEST(dlls/d3dxof/tests) WINE_CONFIG_DLL(davclnt) -WINE_CONFIG_DLL(dbgeng,,[implib]) -WINE_CONFIG_DLL(dbghelp,,[implib]) -WINE_CONFIG_DLL(dciman32,,[implib]) +WINE_CONFIG_DLL(dbgeng) +WINE_CONFIG_DLL(dbghelp) +WINE_CONFIG_DLL(dciman32) WINE_CONFIG_DLL(ddeml.dll16,enable_win16) -WINE_CONFIG_DLL(ddraw,,[implib]) +WINE_CONFIG_DLL(ddraw) WINE_CONFIG_TEST(dlls/ddraw/tests) WINE_CONFIG_DLL(ddrawex) WINE_CONFIG_TEST(dlls/ddrawex/tests) @@ -3154,9 +3154,9 @@ WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) WINE_CONFIG_DLL(dhtmled.ocx) WINE_CONFIG_DLL(difxapi) -WINE_CONFIG_DLL(dinput,,[implib,staticimplib]) +WINE_CONFIG_DLL(dinput) WINE_CONFIG_TEST(dlls/dinput/tests) -WINE_CONFIG_DLL(dinput8,,[implib]) +WINE_CONFIG_DLL(dinput8) WINE_CONFIG_TEST(dlls/dinput8/tests) WINE_CONFIG_DLL(dispdib.dll16,enable_win16) WINE_CONFIG_DLL(dispex) @@ -3179,13 +3179,13 @@ WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic) WINE_CONFIG_TEST(dlls/dmusic/tests) WINE_CONFIG_DLL(dmusic32) -WINE_CONFIG_DLL(dnsapi,,[implib]) +WINE_CONFIG_DLL(dnsapi) WINE_CONFIG_TEST(dlls/dnsapi/tests) WINE_CONFIG_DLL(dplay) -WINE_CONFIG_DLL(dplayx,,[implib]) +WINE_CONFIG_DLL(dplayx) WINE_CONFIG_TEST(dlls/dplayx/tests) WINE_CONFIG_DLL(dpnaddr) -WINE_CONFIG_DLL(dpnet,,[implib]) +WINE_CONFIG_DLL(dpnet) WINE_CONFIG_TEST(dlls/dpnet/tests) WINE_CONFIG_DLL(dpnhpast) WINE_CONFIG_DLL(dpnlobby) @@ -3193,22 +3193,22 @@ WINE_CONFIG_DLL(dpvoice) WINE_CONFIG_TEST(dlls/dpvoice/tests) WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) -WINE_CONFIG_DLL(dsound,,[implib]) +WINE_CONFIG_DLL(dsound) WINE_CONFIG_TEST(dlls/dsound/tests) WINE_CONFIG_DLL(dsquery) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave) WINE_CONFIG_TEST(dlls/dswave/tests) -WINE_CONFIG_DLL(dwmapi,,[implib]) -WINE_CONFIG_DLL(dwrite,,[implib]) +WINE_CONFIG_DLL(dwmapi) +WINE_CONFIG_DLL(dwrite) WINE_CONFIG_TEST(dlls/dwrite/tests) WINE_CONFIG_DLL(dx8vb) WINE_CONFIG_DLL(dxdiagn) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) WINE_CONFIG_LIB(dxerr9) -WINE_CONFIG_DLL(dxgi,,[implib]) +WINE_CONFIG_DLL(dxgi) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) WINE_CONFIG_DLL(dxva2) @@ -3240,7 +3240,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0) -WINE_CONFIG_DLL(faultrep,,[implib]) +WINE_CONFIG_DLL(faultrep) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fltmgr.sys) @@ -3252,37 +3252,37 @@ WINE_CONFIG_DLL(fwpuclnt) WINE_CONFIG_DLL(gameux) WINE_CONFIG_TEST(dlls/gameux/tests) WINE_CONFIG_DLL(gdi.exe16,enable_win16) -WINE_CONFIG_DLL(gdi32,,[implib]) +WINE_CONFIG_DLL(gdi32) WINE_CONFIG_TEST(dlls/gdi32/tests) -WINE_CONFIG_DLL(gdiplus,,[implib]) +WINE_CONFIG_DLL(gdiplus) WINE_CONFIG_TEST(dlls/gdiplus/tests) -WINE_CONFIG_DLL(glu32,,[implib]) +WINE_CONFIG_DLL(glu32) WINE_CONFIG_DLL(gphoto2.ds) WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) -WINE_CONFIG_DLL(hhctrl.ocx,,[implib],[htmlhelp]) -WINE_CONFIG_DLL(hid,,[implib]) +WINE_CONFIG_DLL(hhctrl.ocx) +WINE_CONFIG_DLL(hid) WINE_CONFIG_TEST(dlls/hid/tests) -WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) -WINE_CONFIG_DLL(hlink,,[implib]) +WINE_CONFIG_DLL(hidclass.sys) +WINE_CONFIG_DLL(hlink) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg) WINE_CONFIG_TEST(dlls/hnetcfg/tests) -WINE_CONFIG_DLL(httpapi,,[implib]) +WINE_CONFIG_DLL(httpapi) WINE_CONFIG_TEST(dlls/httpapi/tests) WINE_CONFIG_DLL(iccvid) WINE_CONFIG_DLL(icmp) -WINE_CONFIG_DLL(ieframe,,[implib]) +WINE_CONFIG_DLL(ieframe) WINE_CONFIG_TEST(dlls/ieframe/tests) WINE_CONFIG_DLL(ieproxy) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) WINE_CONFIG_DLL(imaadp32.acm) -WINE_CONFIG_DLL(imagehlp,,[implib]) +WINE_CONFIG_DLL(imagehlp) WINE_CONFIG_TEST(dlls/imagehlp/tests) WINE_CONFIG_DLL(imm.dll16,enable_win16) -WINE_CONFIG_DLL(imm32,,[implib]) +WINE_CONFIG_DLL(imm32) WINE_CONFIG_TEST(dlls/imm32/tests) -WINE_CONFIG_DLL(inetcomm,,[implib]) +WINE_CONFIG_DLL(inetcomm) WINE_CONFIG_TEST(dlls/inetcomm/tests) WINE_CONFIG_DLL(inetcpl.cpl) WINE_CONFIG_DLL(inetmib1) @@ -3292,7 +3292,7 @@ WINE_CONFIG_TEST(dlls/infosoft/tests) WINE_CONFIG_DLL(initpki) WINE_CONFIG_DLL(inkobj) WINE_CONFIG_DLL(inseng) -WINE_CONFIG_DLL(iphlpapi,,[implib]) +WINE_CONFIG_DLL(iphlpapi) WINE_CONFIG_TEST(dlls/iphlpapi/tests) WINE_CONFIG_DLL(iprop) WINE_CONFIG_DLL(irprops.cpl) @@ -3302,26 +3302,26 @@ WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(joy.cpl) WINE_CONFIG_DLL(jscript) WINE_CONFIG_TEST(dlls/jscript/tests) -WINE_CONFIG_DLL(jsproxy,,[implib]) +WINE_CONFIG_DLL(jsproxy) WINE_CONFIG_TEST(dlls/jsproxy/tests) WINE_CONFIG_DLL(kerberos) -WINE_CONFIG_DLL(kernel32,,[implib]) +WINE_CONFIG_DLL(kernel32) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(kernelbase) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) -WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) +WINE_CONFIG_DLL(krnl386.exe16,enable_win16) WINE_CONFIG_DLL(ksuser) WINE_CONFIG_DLL(ktmw32) WINE_CONFIG_DLL(l3codeca.acm) -WINE_CONFIG_DLL(loadperf,,[implib]) +WINE_CONFIG_DLL(loadperf) WINE_CONFIG_DLL(localspl) WINE_CONFIG_TEST(dlls/localspl/tests) WINE_CONFIG_DLL(localui) WINE_CONFIG_TEST(dlls/localui/tests) -WINE_CONFIG_DLL(lz32,,[implib]) +WINE_CONFIG_DLL(lz32) WINE_CONFIG_TEST(dlls/lz32/tests) WINE_CONFIG_DLL(lzexpand.dll16,enable_win16) -WINE_CONFIG_DLL(mapi32,,[implib]) +WINE_CONFIG_DLL(mapi32) WINE_CONFIG_TEST(dlls/mapi32/tests) WINE_CONFIG_DLL(mapistub) WINE_CONFIG_DLL(mciavi32) @@ -3329,16 +3329,16 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) -WINE_CONFIG_DLL(mf,,[implib]) +WINE_CONFIG_DLL(mf) WINE_CONFIG_TEST(dlls/mf/tests) WINE_CONFIG_DLL(mf3216) -WINE_CONFIG_DLL(mfplat,,[implib]) +WINE_CONFIG_DLL(mfplat) WINE_CONFIG_TEST(dlls/mfplat/tests) WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_LIB(mfuuid) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) -WINE_CONFIG_DLL(mlang,,[implib]) +WINE_CONFIG_DLL(mlang) WINE_CONFIG_TEST(dlls/mlang/tests) WINE_CONFIG_DLL(mmcndmgr) WINE_CONFIG_TEST(dlls/mmcndmgr/tests) @@ -3349,17 +3349,17 @@ WINE_CONFIG_DLL(mmsystem.dll16,enable_win16) WINE_CONFIG_DLL(monodebg.vxd,enable_win16) WINE_CONFIG_DLL(mountmgr.sys) WINE_CONFIG_DLL(mouse.drv16,enable_win16) -WINE_CONFIG_DLL(mpr,,[implib]) +WINE_CONFIG_DLL(mpr) WINE_CONFIG_TEST(dlls/mpr/tests) -WINE_CONFIG_DLL(mprapi,,[implib]) +WINE_CONFIG_DLL(mprapi) WINE_CONFIG_DLL(msacm.dll16,enable_win16) WINE_CONFIG_DLL(msacm32.drv) -WINE_CONFIG_DLL(msacm32,,[implib]) +WINE_CONFIG_DLL(msacm32) WINE_CONFIG_TEST(dlls/msacm32/tests) WINE_CONFIG_DLL(msadp32.acm) -WINE_CONFIG_DLL(msasn1,,[implib]) +WINE_CONFIG_DLL(msasn1) WINE_CONFIG_DLL(mscat32) -WINE_CONFIG_DLL(mscms,,[implib]) +WINE_CONFIG_DLL(mscms) WINE_CONFIG_TEST(dlls/mscms/tests) WINE_CONFIG_DLL(mscoree) WINE_CONFIG_TEST(dlls/mscoree/tests) @@ -3368,26 +3368,26 @@ WINE_CONFIG_TEST(dlls/msctf/tests) WINE_CONFIG_DLL(msctfp) WINE_CONFIG_DLL(msdaps) WINE_CONFIG_DLL(msdelta) -WINE_CONFIG_DLL(msdmo,,[implib]) +WINE_CONFIG_DLL(msdmo) WINE_CONFIG_TEST(dlls/msdmo/tests) WINE_CONFIG_DLL(msdrm) WINE_CONFIG_DLL(msftedit) WINE_CONFIG_DLL(msg711.acm) WINE_CONFIG_DLL(msgsm32.acm) WINE_CONFIG_DLL(mshtml.tlb) -WINE_CONFIG_DLL(mshtml,,[implib]) +WINE_CONFIG_DLL(mshtml) WINE_CONFIG_TEST(dlls/mshtml/tests) -WINE_CONFIG_DLL(msi,,[implib]) +WINE_CONFIG_DLL(msi) WINE_CONFIG_TEST(dlls/msi/tests) WINE_CONFIG_DLL(msident) -WINE_CONFIG_DLL(msimg32,,[implib]) +WINE_CONFIG_DLL(msimg32) WINE_CONFIG_DLL(msimsg) WINE_CONFIG_DLL(msimtf) WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) -WINE_CONFIG_DLL(mspatcha,,[implib]) +WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msports) WINE_CONFIG_DLL(msrle32) WINE_CONFIG_TEST(dlls/msrle32/tests) @@ -3417,28 +3417,28 @@ WINE_CONFIG_DLL(msvcp71) WINE_CONFIG_DLL(msvcp80) WINE_CONFIG_DLL(msvcp90) WINE_CONFIG_TEST(dlls/msvcp90/tests) -WINE_CONFIG_DLL(msvcr100,,[implib]) +WINE_CONFIG_DLL(msvcr100) WINE_CONFIG_TEST(dlls/msvcr100/tests) -WINE_CONFIG_DLL(msvcr110,,[implib]) -WINE_CONFIG_DLL(msvcr120,,[implib]) +WINE_CONFIG_DLL(msvcr110) +WINE_CONFIG_DLL(msvcr120) WINE_CONFIG_TEST(dlls/msvcr120/tests) WINE_CONFIG_DLL(msvcr120_app) -WINE_CONFIG_DLL(msvcr70,,[implib]) -WINE_CONFIG_DLL(msvcr71,,[implib]) -WINE_CONFIG_DLL(msvcr80,,[implib]) -WINE_CONFIG_DLL(msvcr90,,[implib]) +WINE_CONFIG_DLL(msvcr70) +WINE_CONFIG_DLL(msvcr71) +WINE_CONFIG_DLL(msvcr80) +WINE_CONFIG_DLL(msvcr90) WINE_CONFIG_TEST(dlls/msvcr90/tests) -WINE_CONFIG_DLL(msvcrt,,[implib]) +WINE_CONFIG_DLL(msvcrt) WINE_CONFIG_TEST(dlls/msvcrt/tests) WINE_CONFIG_DLL(msvcrt20) WINE_CONFIG_DLL(msvcrt40) -WINE_CONFIG_DLL(msvcrtd,,[implib]) +WINE_CONFIG_DLL(msvcrtd) WINE_CONFIG_TEST(dlls/msvcrtd/tests) -WINE_CONFIG_DLL(msvfw32,,[implib]) +WINE_CONFIG_DLL(msvfw32) WINE_CONFIG_TEST(dlls/msvfw32/tests) WINE_CONFIG_DLL(msvidc32) WINE_CONFIG_DLL(msvideo.dll16,enable_win16) -WINE_CONFIG_DLL(mswsock,,[implib]) +WINE_CONFIG_DLL(mswsock) WINE_CONFIG_DLL(msxml) WINE_CONFIG_DLL(msxml2) WINE_CONFIG_DLL(msxml3) @@ -3447,28 +3447,28 @@ WINE_CONFIG_DLL(msxml4) WINE_CONFIG_DLL(msxml6) WINE_CONFIG_DLL(mtxdm) WINE_CONFIG_DLL(ncrypt) -WINE_CONFIG_DLL(nddeapi,,[implib]) +WINE_CONFIG_DLL(nddeapi) WINE_CONFIG_DLL(ndis.sys) -WINE_CONFIG_DLL(netapi32,,[implib]) +WINE_CONFIG_DLL(netapi32) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx) WINE_CONFIG_TEST(dlls/netcfgx/tests) WINE_CONFIG_DLL(netprofm) WINE_CONFIG_TEST(dlls/netprofm/tests) -WINE_CONFIG_DLL(newdev,,[implib]) -WINE_CONFIG_DLL(normaliz,,[implib]) +WINE_CONFIG_DLL(newdev) +WINE_CONFIG_DLL(normaliz) WINE_CONFIG_DLL(npmshtml) WINE_CONFIG_DLL(npptools) -WINE_CONFIG_DLL(ntdll,,[implib]) +WINE_CONFIG_DLL(ntdll) WINE_CONFIG_TEST(dlls/ntdll/tests) -WINE_CONFIG_DLL(ntdsapi,,[implib]) +WINE_CONFIG_DLL(ntdsapi) WINE_CONFIG_TEST(dlls/ntdsapi/tests) -WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl]) +WINE_CONFIG_DLL(ntoskrnl.exe) WINE_CONFIG_DLL(ntprint) WINE_CONFIG_TEST(dlls/ntprint/tests) WINE_CONFIG_DLL(objsel) -WINE_CONFIG_DLL(odbc32,,[implib]) -WINE_CONFIG_DLL(odbccp32,,[implib]) +WINE_CONFIG_DLL(odbc32) +WINE_CONFIG_DLL(odbccp32) WINE_CONFIG_TEST(dlls/odbccp32/tests) WINE_CONFIG_DLL(odbccu32) WINE_CONFIG_DLL(ole2.dll16,enable_win16) @@ -3477,38 +3477,38 @@ WINE_CONFIG_DLL(ole2disp.dll16,enable_win16) WINE_CONFIG_DLL(ole2nls.dll16,enable_win16) WINE_CONFIG_DLL(ole2prox.dll16,enable_win16) WINE_CONFIG_DLL(ole2thk.dll16,enable_win16) -WINE_CONFIG_DLL(ole32,,[implib]) +WINE_CONFIG_DLL(ole32) WINE_CONFIG_TEST(dlls/ole32/tests) -WINE_CONFIG_DLL(oleacc,,[implib]) +WINE_CONFIG_DLL(oleacc) WINE_CONFIG_TEST(dlls/oleacc/tests) -WINE_CONFIG_DLL(oleaut32,,[implib]) +WINE_CONFIG_DLL(oleaut32) WINE_CONFIG_TEST(dlls/oleaut32/tests) WINE_CONFIG_DLL(olecli.dll16,enable_win16) -WINE_CONFIG_DLL(olecli32,,[implib]) +WINE_CONFIG_DLL(olecli32) WINE_CONFIG_DLL(oledb32) WINE_CONFIG_TEST(dlls/oledb32/tests) -WINE_CONFIG_DLL(oledlg,,[implib]) +WINE_CONFIG_DLL(oledlg) WINE_CONFIG_TEST(dlls/oledlg/tests) -WINE_CONFIG_DLL(olepro32,,[implib]) +WINE_CONFIG_DLL(olepro32) WINE_CONFIG_DLL(olesvr.dll16,enable_win16) -WINE_CONFIG_DLL(olesvr32,,[implib]) +WINE_CONFIG_DLL(olesvr32) WINE_CONFIG_DLL(olethk32) WINE_CONFIG_DLL(openal32) WINE_CONFIG_DLL(opencl) -WINE_CONFIG_DLL(opengl32,,[implib]) +WINE_CONFIG_DLL(opengl32) WINE_CONFIG_TEST(dlls/opengl32/tests) WINE_CONFIG_DLL(packager) WINE_CONFIG_TEST(dlls/packager/tests) -WINE_CONFIG_DLL(pdh,,[implib]) +WINE_CONFIG_DLL(pdh) WINE_CONFIG_TEST(dlls/pdh/tests) WINE_CONFIG_DLL(photometadatahandler) WINE_CONFIG_DLL(pidgen) -WINE_CONFIG_DLL(powrprof,,[implib]) +WINE_CONFIG_DLL(powrprof) WINE_CONFIG_DLL(printui) WINE_CONFIG_DLL(prntvpt) -WINE_CONFIG_DLL(propsys,,[implib]) +WINE_CONFIG_DLL(propsys) WINE_CONFIG_TEST(dlls/propsys/tests) -WINE_CONFIG_DLL(psapi,,[implib]) +WINE_CONFIG_DLL(psapi) WINE_CONFIG_TEST(dlls/psapi/tests) WINE_CONFIG_DLL(pstorec) WINE_CONFIG_TEST(dlls/pstorec/tests) @@ -3519,26 +3519,26 @@ WINE_CONFIG_TEST(dlls/qedit/tests) WINE_CONFIG_DLL(qmgr) WINE_CONFIG_TEST(dlls/qmgr/tests) WINE_CONFIG_DLL(qmgrprxy) -WINE_CONFIG_DLL(quartz,,[implib]) +WINE_CONFIG_DLL(quartz) WINE_CONFIG_TEST(dlls/quartz/tests) WINE_CONFIG_DLL(query) WINE_CONFIG_DLL(rasapi16.dll16,enable_win16) -WINE_CONFIG_DLL(rasapi32,,[implib]) +WINE_CONFIG_DLL(rasapi32) WINE_CONFIG_TEST(dlls/rasapi32/tests) -WINE_CONFIG_DLL(rasdlg,,[implib]) +WINE_CONFIG_DLL(rasdlg) WINE_CONFIG_DLL(regapi) -WINE_CONFIG_DLL(resutils,,[implib]) -WINE_CONFIG_DLL(riched20,,[implib]) +WINE_CONFIG_DLL(resutils) +WINE_CONFIG_DLL(riched20) WINE_CONFIG_TEST(dlls/riched20/tests) WINE_CONFIG_DLL(riched32) WINE_CONFIG_TEST(dlls/riched32/tests) -WINE_CONFIG_DLL(rpcrt4,,[implib]) +WINE_CONFIG_DLL(rpcrt4) WINE_CONFIG_TEST(dlls/rpcrt4/tests) WINE_CONFIG_DLL(rsabase) -WINE_CONFIG_DLL(rsaenh,,[implib]) +WINE_CONFIG_DLL(rsaenh) WINE_CONFIG_TEST(dlls/rsaenh/tests) WINE_CONFIG_DLL(rstrtmgr) -WINE_CONFIG_DLL(rtutils,,[implib]) +WINE_CONFIG_DLL(rtutils) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds) WINE_CONFIG_DLL(sapi) @@ -3553,52 +3553,52 @@ WINE_CONFIG_DLL(scrobj) WINE_CONFIG_DLL(scrrun) WINE_CONFIG_TEST(dlls/scrrun/tests) WINE_CONFIG_DLL(scsiport.sys) -WINE_CONFIG_DLL(secur32,,[implib]) +WINE_CONFIG_DLL(secur32) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) -WINE_CONFIG_DLL(sensapi,,[implib]) +WINE_CONFIG_DLL(sensapi) WINE_CONFIG_DLL(serialui) WINE_CONFIG_TEST(dlls/serialui/tests) -WINE_CONFIG_DLL(setupapi,,[implib]) +WINE_CONFIG_DLL(setupapi) WINE_CONFIG_TEST(dlls/setupapi/tests) WINE_CONFIG_DLL(setupx.dll16,enable_win16) -WINE_CONFIG_DLL(sfc,,[implib]) -WINE_CONFIG_DLL(sfc_os,,[implib]) +WINE_CONFIG_DLL(sfc) +WINE_CONFIG_DLL(sfc_os) WINE_CONFIG_DLL(shcore) WINE_CONFIG_DLL(shdoclc) -WINE_CONFIG_DLL(shdocvw,,[implib]) +WINE_CONFIG_DLL(shdocvw) WINE_CONFIG_TEST(dlls/shdocvw/tests) WINE_CONFIG_DLL(shell.dll16,enable_win16) -WINE_CONFIG_DLL(shell32,,[implib]) +WINE_CONFIG_DLL(shell32) WINE_CONFIG_TEST(dlls/shell32/tests) -WINE_CONFIG_DLL(shfolder,,[implib]) -WINE_CONFIG_DLL(shlwapi,,[implib]) +WINE_CONFIG_DLL(shfolder) +WINE_CONFIG_DLL(shlwapi) WINE_CONFIG_TEST(dlls/shlwapi/tests) WINE_CONFIG_DLL(slbcsp) -WINE_CONFIG_DLL(slc,,[implib]) +WINE_CONFIG_DLL(slc) WINE_CONFIG_TEST(dlls/slc/tests) -WINE_CONFIG_DLL(snmpapi,,[implib]) +WINE_CONFIG_DLL(snmpapi) WINE_CONFIG_TEST(dlls/snmpapi/tests) WINE_CONFIG_DLL(softpub) WINE_CONFIG_DLL(sound.drv16,enable_win16) -WINE_CONFIG_DLL(spoolss,,[implib]) +WINE_CONFIG_DLL(spoolss) WINE_CONFIG_TEST(dlls/spoolss/tests) WINE_CONFIG_DLL(sspicli) WINE_CONFIG_DLL(stdole2.tlb) WINE_CONFIG_DLL(stdole32.tlb) -WINE_CONFIG_DLL(sti,,[implib]) +WINE_CONFIG_DLL(sti) WINE_CONFIG_TEST(dlls/sti/tests) WINE_CONFIG_DLL(storage.dll16,enable_win16) WINE_CONFIG_DLL(stress.dll16,enable_win16) WINE_CONFIG_LIB(strmbase) WINE_CONFIG_LIB(strmiids) WINE_CONFIG_DLL(svrapi) -WINE_CONFIG_DLL(sxs,,[implib]) +WINE_CONFIG_DLL(sxs) WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) -WINE_CONFIG_DLL(t2embed,,[implib]) +WINE_CONFIG_DLL(t2embed) WINE_CONFIG_TEST(dlls/t2embed/tests) -WINE_CONFIG_DLL(tapi32,,[implib]) +WINE_CONFIG_DLL(tapi32) WINE_CONFIG_DLL(taskschd) WINE_CONFIG_TEST(dlls/taskschd/tests) WINE_CONFIG_DLL(tdh) @@ -3609,25 +3609,25 @@ WINE_CONFIG_DLL(twain.dll16,enable_win16) WINE_CONFIG_DLL(twain_32) WINE_CONFIG_TEST(dlls/twain_32/tests) WINE_CONFIG_DLL(typelib.dll16,enable_win16) -WINE_CONFIG_DLL(ucrtbase,,[implib]) +WINE_CONFIG_DLL(ucrtbase) WINE_CONFIG_TEST(dlls/ucrtbase/tests) WINE_CONFIG_DLL(uiautomationcore) WINE_CONFIG_DLL(uiribbon) -WINE_CONFIG_DLL(unicows,,[implib]) +WINE_CONFIG_DLL(unicows) WINE_CONFIG_DLL(updspapi) -WINE_CONFIG_DLL(url,,[implib]) -WINE_CONFIG_DLL(urlmon,,[implib]) +WINE_CONFIG_DLL(url) +WINE_CONFIG_DLL(urlmon) WINE_CONFIG_TEST(dlls/urlmon/tests) -WINE_CONFIG_DLL(usbd.sys,,[implib],[usbd]) +WINE_CONFIG_DLL(usbd.sys) WINE_CONFIG_DLL(user.exe16,enable_win16) -WINE_CONFIG_DLL(user32,,[implib]) +WINE_CONFIG_DLL(user32) WINE_CONFIG_TEST(dlls/user32/tests) -WINE_CONFIG_DLL(userenv,,[implib]) +WINE_CONFIG_DLL(userenv) WINE_CONFIG_TEST(dlls/userenv/tests) -WINE_CONFIG_DLL(usp10,,[implib]) +WINE_CONFIG_DLL(usp10) WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) -WINE_CONFIG_DLL(uxtheme,,[implib]) +WINE_CONFIG_DLL(uxtheme) WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) @@ -3640,9 +3640,9 @@ WINE_CONFIG_DLL(vcomp140) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vcruntime140) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) -WINE_CONFIG_DLL(vdmdbg,,[implib]) +WINE_CONFIG_DLL(vdmdbg) WINE_CONFIG_DLL(ver.dll16,enable_win16) -WINE_CONFIG_DLL(version,,[implib]) +WINE_CONFIG_DLL(version) WINE_CONFIG_TEST(dlls/version/tests) WINE_CONFIG_DLL(virtdisk) WINE_CONFIG_DLL(vmm.vxd,enable_win16) @@ -3658,9 +3658,9 @@ WINE_CONFIG_TEST(dlls/wbemdisp/tests) WINE_CONFIG_DLL(wbemprox) WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(wdscore) -WINE_CONFIG_DLL(webservices,,[implib]) +WINE_CONFIG_DLL(webservices) WINE_CONFIG_TEST(dlls/webservices/tests) -WINE_CONFIG_DLL(wer,,[implib]) +WINE_CONFIG_DLL(wer) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc) @@ -3670,16 +3670,16 @@ WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) WINE_CONFIG_DLL(windebug.dll16,enable_win16) -WINE_CONFIG_DLL(windowscodecs,,[implib]) +WINE_CONFIG_DLL(windowscodecs) WINE_CONFIG_TEST(dlls/windowscodecs/tests) -WINE_CONFIG_DLL(windowscodecsext,,[implib]) +WINE_CONFIG_DLL(windowscodecsext) WINE_CONFIG_TEST(dlls/windowscodecsext/tests) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(wineandroid.drv) WINE_CONFIG_DLL(winebus.sys) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) -WINE_CONFIG_DLL(wined3d,,[implib]) +WINE_CONFIG_DLL(wined3d) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winehid.sys) WINE_CONFIG_DLL(winejoystick.drv) @@ -3693,28 +3693,28 @@ WINE_CONFIG_DLL(wineqtdecoder) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) -WINE_CONFIG_DLL(winhttp,,[implib]) +WINE_CONFIG_DLL(winhttp) WINE_CONFIG_TEST(dlls/winhttp/tests) -WINE_CONFIG_DLL(wininet,,[implib]) +WINE_CONFIG_DLL(wininet) WINE_CONFIG_TEST(dlls/wininet/tests) -WINE_CONFIG_DLL(winmm,,[implib]) +WINE_CONFIG_DLL(winmm) WINE_CONFIG_TEST(dlls/winmm/tests) WINE_CONFIG_DLL(winnls.dll16,enable_win16) -WINE_CONFIG_DLL(winnls32,,[implib]) -WINE_CONFIG_DLL(winscard,,[implib]) +WINE_CONFIG_DLL(winnls32) +WINE_CONFIG_DLL(winscard) WINE_CONFIG_DLL(winsock.dll16,enable_win16) -WINE_CONFIG_DLL(winspool.drv,,[implib],[winspool]) +WINE_CONFIG_DLL(winspool.drv) WINE_CONFIG_TEST(dlls/winspool.drv/tests) WINE_CONFIG_DLL(winsta) WINE_CONFIG_DLL(wintab.dll16,enable_win16) -WINE_CONFIG_DLL(wintab32,,[implib]) +WINE_CONFIG_DLL(wintab32) WINE_CONFIG_TEST(dlls/wintab32/tests) -WINE_CONFIG_DLL(wintrust,,[implib]) +WINE_CONFIG_DLL(wintrust) WINE_CONFIG_TEST(dlls/wintrust/tests) WINE_CONFIG_DLL(winusb) -WINE_CONFIG_DLL(wlanapi,,[implib]) +WINE_CONFIG_DLL(wlanapi) WINE_CONFIG_TEST(dlls/wlanapi/tests) -WINE_CONFIG_DLL(wldap32,,[implib]) +WINE_CONFIG_DLL(wldap32) WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmasf) WINE_CONFIG_DLL(wmi) @@ -3723,23 +3723,23 @@ WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp) WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmphoto) -WINE_CONFIG_DLL(wmvcore,,[implib]) +WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_TEST(dlls/wmvcore/tests) -WINE_CONFIG_DLL(wnaspi32,,[implib]) -WINE_CONFIG_DLL(wow32,enable_win16,[implib]) +WINE_CONFIG_DLL(wnaspi32) +WINE_CONFIG_DLL(wow32,enable_win16) WINE_CONFIG_DLL(wpc) WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) -WINE_CONFIG_DLL(ws2_32,,[implib]) +WINE_CONFIG_DLL(ws2_32) WINE_CONFIG_TEST(dlls/ws2_32/tests) -WINE_CONFIG_DLL(wsdapi,,[implib]) +WINE_CONFIG_DLL(wsdapi) WINE_CONFIG_TEST(dlls/wsdapi/tests) WINE_CONFIG_DLL(wshom.ocx) WINE_CONFIG_TEST(dlls/wshom.ocx/tests) -WINE_CONFIG_DLL(wsnmp32,,[implib]) +WINE_CONFIG_DLL(wsnmp32) WINE_CONFIG_TEST(dlls/wsnmp32/tests) -WINE_CONFIG_DLL(wsock32,,[implib]) -WINE_CONFIG_DLL(wtsapi32,,[implib]) +WINE_CONFIG_DLL(wsock32) +WINE_CONFIG_DLL(wtsapi32) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi) WINE_CONFIG_DLL(wuaueng) @@ -3769,22 +3769,22 @@ WINE_CONFIG_DLL(xaudio2_8) WINE_CONFIG_DLL(xaudio2_9) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) -WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) +WINE_CONFIG_DLL(xinput1_3) WINE_CONFIG_TEST(dlls/xinput1_3/tests) WINE_CONFIG_DLL(xinput1_4) WINE_CONFIG_DLL(xinput9_1_0) -WINE_CONFIG_DLL(xmllite,,[implib]) +WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_DLL(xpsprint) WINE_CONFIG_DLL(xpssvcs) -WINE_CONFIG_MAKEFILE([fonts]) -WINE_CONFIG_MAKEFILE([include]) -WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine],,[implib]) -WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader]) -WINE_CONFIG_MAKEFILE([po]) +WINE_CONFIG_MAKEFILE(fonts) +WINE_CONFIG_MAKEFILE(include) +WINE_CONFIG_MAKEFILE(libs/port) +WINE_CONFIG_MAKEFILE(libs/wine) +WINE_CONFIG_MAKEFILE(libs/wpp) +WINE_CONFIG_MAKEFILE(loader) +WINE_CONFIG_MAKEFILE(po) WINE_CONFIG_PROGRAM(arp) WINE_CONFIG_PROGRAM(aspnet_regiis) WINE_CONFIG_PROGRAM(attrib) @@ -3884,7 +3884,7 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa) WINE_CONFIG_PROGRAM(xcopy) WINE_CONFIG_TEST(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE([server]) +WINE_CONFIG_MAKEFILE(server) WINE_CONFIG_TOOL(tools) WINE_CONFIG_TOOL(tools/sfnt2fon) WINE_CONFIG_TOOL(tools/widl) diff --git a/tools/make_makefiles b/tools/make_makefiles index ae779d17fc8..86d775f8930 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -234,7 +234,6 @@ sub parse_makefile($) { my $var = $1; $make{$var} = $2; - ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } my $source_vars_regexp = join "|", @source_vars; @@ -357,7 +356,6 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /\.c$/) { - ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"}; push @{${$make}{"=C_SRCS"}}, $name; } elsif ($name =~ /\.h$/ || $name =~ /\.rh$/ || $name =~ /\.inl$/ || $name =~ /\.x$/) @@ -425,14 +423,13 @@ sub update_makefiles(@) my %make = %{$makefiles{$file}}; my $args = ""; my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}}); - my $flag_args = defined $make{"=flags"} ? ",[" . join(",",sort keys %{$make{"=flags"}}) ."]" : ""; if (defined($make{"TESTDLL"})) # test { die "TESTDLL should not be defined in $file" unless $file =~ /\/tests\/Makefile$/; die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; - push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; + push @lines, "WINE_CONFIG_TEST($dir)\n"; } elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib { @@ -440,7 +437,7 @@ sub update_makefiles(@) die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; - push @lines, "WINE_CONFIG_LIB($name$flag_args)\n"; + push @lines, "WINE_CONFIG_LIB($name)\n"; } elsif (defined($make{"MODULE"}) && defined($make{"APPMODE"})) # program { @@ -455,9 +452,8 @@ sub update_makefiles(@) { die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe"; } - $args .= "," if $is_win16 || defined $make{"=flags"}; - $args .= "enable_win16" if $is_win16; - push @lines, "WINE_CONFIG_PROGRAM($name$args$flag_args)\n"; + $args .= ",enable_win16" if $is_win16; + push @lines, "WINE_CONFIG_PROGRAM($name$args)\n"; } elsif (defined($make{"MODULE"})) # dll { @@ -475,10 +471,7 @@ sub update_makefiles(@) } my $implib = $make{"IMPORTLIB"} || ""; die "Invalid IMPORTLIB name in $file" if $implib =~ /\./; - $args .= "," if $is_win16 || defined $make{"=flags"}; - $args .= "enable_win16" if $is_win16; - $args .= $flag_args; - $args .= ",[$implib]" if $implib && $implib ne $name; + $args .= ",enable_win16" if $is_win16; push @lines, "WINE_CONFIG_DLL($name$args)\n"; } elsif ($file =~ /^tools.*\/Makefile$/) @@ -486,14 +479,12 @@ sub update_makefiles(@) die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; (my $name = $file) =~ s/^(.*)\/Makefile/$1/; - push @lines, "WINE_CONFIG_TOOL($name$flag_args)\n"; + push @lines, "WINE_CONFIG_TOOL($name)\n"; } elsif ($file =~ /\/Makefile$/) { (my $name = $file) =~ s/^(.*)\/Makefile/$1/; - $args = "[$name]"; - $args .= "," if defined $make{"=flags"}; - push @lines, "WINE_CONFIG_MAKEFILE($args$flag_args)\n"; + push @lines, "WINE_CONFIG_MAKEFILE($name)\n"; } } diff --git a/tools/makedep.c b/tools/makedep.c index 03b984e1bb0..b9f194851ba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3399,17 +3399,26 @@ static void output_programs( struct makefile *make ) */ static void output_subdirs( struct makefile *make ) { + struct strarray symlinks = empty_strarray; struct strarray build_deps = empty_strarray; struct strarray makefile_deps = empty_strarray; struct strarray clean_files = empty_strarray; struct strarray testclean_files = empty_strarray; struct strarray distclean_files = empty_strarray; + struct strarray tools_deps = empty_strarray; unsigned int i, j; + strarray_add( &tools_deps, tools_dir_path( make, "widl" )); + strarray_add( &tools_deps, tools_dir_path( make, "winebuild" )); + strarray_add( &tools_deps, tools_dir_path( make, "winegcc" )); + strarray_add( &tools_deps, obj_dir_path( make, "include" )); + strarray_add( &tools_deps, "dummy" ); + strarray_addall( &distclean_files, make->distclean_files ); for (i = 0; i < make->subdirs.count; i++) { const struct makefile *submake = make->submakes[i]; + char *subdir = base_dir_path( submake, "" ); strarray_add( &makefile_deps, top_src_dir_path( make, base_dir_path( submake, strmake ( "%s.in", output_makefile_name )))); @@ -3419,7 +3428,60 @@ static void output_subdirs( struct makefile *make ) strarray_add( &distclean_files, base_dir_path( submake, submake->distclean_files.str[j] )); for (j = 0; j < submake->ok_files.count; j++) strarray_add( &testclean_files, base_dir_path( submake, submake->ok_files.str[j] )); - strarray_addall( &build_deps, output_importlib_symlinks( make, submake )); + + /* import libs are still created for disabled dirs, except for win16 ones */ + if (submake->module && submake->importlib && !(submake->disabled && submake->is_win16)) + { + char *importlib_path = base_dir_path( submake, strmake( "lib%s", submake->importlib )); + if (submake->implib_objs.count) + { + output( "%s.a:", importlib_path ); + output_filenames( tools_deps ); + output( "\n" ); + output( "\t@cd %s && $(MAKE) lib%s.a\n", subdir, submake->importlib ); + strarray_add( &build_deps, strmake( "%s.a", importlib_path )); + if (crosstarget) + { + output( "%s.cross.a:", importlib_path ); + output_filenames( tools_deps ); + output( "\n" ); + output( "\t@cd %s && $(MAKE) lib%s.cross.a\n", subdir, submake->importlib ); + strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); + } + } + else + { + const char *libext = *dll_ext ? ".def" : ".a"; + char *spec_file = top_src_dir_path( make, base_dir_path( submake, + replace_extension( submake->module, ".dll", ".spec" ))); + output( "%s%s: %s", importlib_path, libext, spec_file ); + output_filename( tools_path( make, "winebuild" )); + output( "\n" ); + output( "\t%s -w -o $@", tools_path( make, "winebuild" )); + output_filename( *dll_ext ? "--def" : "--implib" ); + output_filenames( target_flags ); + if (submake->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + strarray_add( &build_deps, strmake( "%s%s", importlib_path, libext )); + if (crosstarget && !submake->is_win16) + { + output( "%s.cross.a: %s", importlib_path, spec_file ); + output_filename( tools_path( make, "winebuild" )); + output( "\n" ); + output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); + output_filename( "--implib" ); + output_filenames( target_flags ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path )); + } + } + strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); + } + if (submake->disabled) continue; if (submake->install_rules[INSTALL_LIB].count) { @@ -3446,12 +3508,13 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, "distclean" ); strarray_add( &make->phony_targets, "testclean" ); + strarray_addall( &make->clean_files, symlinks ); + strarray_addall( &build_deps, symlinks ); if (build_deps.count) { output( "__builddeps__:" ); output_filenames( build_deps ); output( "\n" ); - strarray_addall( &make->clean_files, build_deps ); } if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); }