configure: Add a generic mechanism for passing flags to dll and program rules.
diff --git a/configure.ac b/configure.ac
index 9a68ca6..773a727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2313,66 +2313,66 @@
WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules])
WINE_CONFIG_DLL(acledit)
-WINE_CONFIG_DLL(aclui,,[aclui])
-WINE_CONFIG_DLL(activeds,,[activeds])
+WINE_CONFIG_DLL(aclui,,[implib],[aclui])
+WINE_CONFIG_DLL(activeds,,[implib],[activeds])
WINE_CONFIG_DLL(actxprxy)
WINE_CONFIG_LIB(adsiid)
-WINE_CONFIG_DLL(advapi32,,[advapi32])
+WINE_CONFIG_DLL(advapi32,,[implib],[advapi32])
WINE_CONFIG_TEST(dlls/advapi32/tests)
-WINE_CONFIG_DLL(advpack,,[advpack])
+WINE_CONFIG_DLL(advpack,,[implib],[advpack])
WINE_CONFIG_TEST(dlls/advpack/tests)
WINE_CONFIG_DLL(amstream)
WINE_CONFIG_TEST(dlls/amstream/tests)
WINE_CONFIG_DLL(appwiz.cpl)
-WINE_CONFIG_DLL(atl,,[atl])
+WINE_CONFIG_DLL(atl,,[implib],[atl])
WINE_CONFIG_TEST(dlls/atl/tests)
WINE_CONFIG_DLL(authz)
-WINE_CONFIG_DLL(avicap32,,[avicap32])
-WINE_CONFIG_DLL(avifil32,,[avifil32])
+WINE_CONFIG_DLL(avicap32,,[implib],[avicap32])
+WINE_CONFIG_DLL(avifil32,,[implib],[avifil32])
WINE_CONFIG_TEST(dlls/avifil32/tests)
WINE_CONFIG_DLL(avifile.dll16,enable_win16)
-WINE_CONFIG_DLL(avrt,,[avrt])
+WINE_CONFIG_DLL(avrt,,[implib],[avrt])
WINE_CONFIG_DLL(bcrypt)
WINE_CONFIG_DLL(browseui)
WINE_CONFIG_TEST(dlls/browseui/tests)
-WINE_CONFIG_DLL(cabinet,,[cabinet])
+WINE_CONFIG_DLL(cabinet,,[implib],[cabinet])
WINE_CONFIG_TEST(dlls/cabinet/tests)
-WINE_CONFIG_DLL(capi2032,,[capi2032])
-WINE_CONFIG_DLL(cards,,[cards])
-WINE_CONFIG_DLL(cfgmgr32,,[cfgmgr32])
-WINE_CONFIG_DLL(clusapi,,[clusapi])
+WINE_CONFIG_DLL(capi2032,,[implib],[capi2032])
+WINE_CONFIG_DLL(cards,,[implib],[cards])
+WINE_CONFIG_DLL(cfgmgr32,,[implib],[cfgmgr32])
+WINE_CONFIG_DLL(clusapi,,[implib],[clusapi])
WINE_CONFIG_DLL(comcat)
WINE_CONFIG_TEST(dlls/comcat/tests)
-WINE_CONFIG_DLL(comctl32,,[comctl32])
+WINE_CONFIG_DLL(comctl32,,[implib],[comctl32])
WINE_CONFIG_TEST(dlls/comctl32/tests)
-WINE_CONFIG_DLL(comdlg32,,[comdlg32])
+WINE_CONFIG_DLL(comdlg32,,[implib],[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,,[compstui])
-WINE_CONFIG_DLL(credui,,[credui])
+WINE_CONFIG_DLL(compstui,,[implib],[compstui])
+WINE_CONFIG_DLL(credui,,[implib],[credui])
WINE_CONFIG_TEST(dlls/credui/tests)
-WINE_CONFIG_DLL(crtdll,,[crtdll])
-WINE_CONFIG_DLL(crypt32,,[crypt32])
+WINE_CONFIG_DLL(crtdll,,[implib],[crtdll])
+WINE_CONFIG_DLL(crypt32,,[implib],[crypt32])
WINE_CONFIG_TEST(dlls/crypt32/tests)
WINE_CONFIG_DLL(cryptdlg)
-WINE_CONFIG_DLL(cryptdll,,[cryptdll])
-WINE_CONFIG_DLL(cryptnet,,[cryptnet])
+WINE_CONFIG_DLL(cryptdll,,[implib],[cryptdll])
+WINE_CONFIG_DLL(cryptnet,,[implib],[cryptnet])
WINE_CONFIG_TEST(dlls/cryptnet/tests)
-WINE_CONFIG_DLL(cryptui,,[cryptui])
+WINE_CONFIG_DLL(cryptui,,[implib],[cryptui])
WINE_CONFIG_TEST(dlls/cryptui/tests)
WINE_CONFIG_DLL(ctapi32)
WINE_CONFIG_DLL(ctl3d.dll16,enable_win16)
-WINE_CONFIG_DLL(ctl3d32,,[ctl3d32])
+WINE_CONFIG_DLL(ctl3d32,,[implib],[ctl3d32])
WINE_CONFIG_DLL(ctl3dv2.dll16,enable_win16)
-WINE_CONFIG_DLL(d3d10,,[d3d10])
+WINE_CONFIG_DLL(d3d10,,[implib],[d3d10])
WINE_CONFIG_TEST(dlls/d3d10/tests)
-WINE_CONFIG_DLL(d3d10core,,[d3d10core])
+WINE_CONFIG_DLL(d3d10core,,[implib],[d3d10core])
WINE_CONFIG_TEST(dlls/d3d10core/tests)
-WINE_CONFIG_DLL(d3d8,,[d3d8])
+WINE_CONFIG_DLL(d3d8,,[implib],[d3d8])
WINE_CONFIG_TEST(dlls/d3d8/tests)
-WINE_CONFIG_DLL(d3d9,,[d3d9])
+WINE_CONFIG_DLL(d3d9,,[implib],[d3d9])
WINE_CONFIG_TEST(dlls/d3d9/tests)
WINE_CONFIG_DLL(d3dcompiler_33)
WINE_CONFIG_DLL(d3dcompiler_34)
@@ -2384,10 +2384,10 @@
WINE_CONFIG_DLL(d3dcompiler_40)
WINE_CONFIG_DLL(d3dcompiler_41)
WINE_CONFIG_DLL(d3dcompiler_42)
-WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler])
+WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler])
WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests)
-WINE_CONFIG_DLL(d3dim,,[d3dim])
-WINE_CONFIG_DLL(d3drm,,[d3drm])
+WINE_CONFIG_DLL(d3dim,,[implib],[d3dim])
+WINE_CONFIG_DLL(d3drm,,[implib],[d3drm])
WINE_CONFIG_TEST(dlls/d3drm/tests)
WINE_CONFIG_DLL(d3dx10_33)
WINE_CONFIG_DLL(d3dx10_34)
@@ -2412,7 +2412,7 @@
WINE_CONFIG_DLL(d3dx9_33)
WINE_CONFIG_DLL(d3dx9_34)
WINE_CONFIG_DLL(d3dx9_35)
-WINE_CONFIG_DLL(d3dx9_36,,[d3dx9])
+WINE_CONFIG_DLL(d3dx9_36,,[implib],[d3dx9])
WINE_CONFIG_TEST(dlls/d3dx9_36/tests)
WINE_CONFIG_DLL(d3dx9_37)
WINE_CONFIG_DLL(d3dx9_38)
@@ -2421,20 +2421,20 @@
WINE_CONFIG_DLL(d3dx9_41)
WINE_CONFIG_DLL(d3dx9_42)
WINE_CONFIG_DLL(d3dx9_43)
-WINE_CONFIG_DLL(d3dxof,,[d3dxof])
+WINE_CONFIG_DLL(d3dxof,,[implib],[d3dxof])
WINE_CONFIG_TEST(dlls/d3dxof/tests)
-WINE_CONFIG_DLL(dbgeng,,[dbgeng])
-WINE_CONFIG_DLL(dbghelp,,[dbghelp])
-WINE_CONFIG_DLL(dciman32,,[dciman32])
+WINE_CONFIG_DLL(dbgeng,,[implib],[dbgeng])
+WINE_CONFIG_DLL(dbghelp,,[implib],[dbghelp])
+WINE_CONFIG_DLL(dciman32,,[implib],[dciman32])
WINE_CONFIG_DLL(ddeml.dll16,enable_win16)
-WINE_CONFIG_DLL(ddraw,,[ddraw])
+WINE_CONFIG_DLL(ddraw,,[implib],[ddraw])
WINE_CONFIG_TEST(dlls/ddraw/tests)
WINE_CONFIG_DLL(ddrawex)
WINE_CONFIG_TEST(dlls/ddrawex/tests)
WINE_CONFIG_DLL(devenum)
-WINE_CONFIG_DLL(dinput,,[dinput],[data_formats.c])
+WINE_CONFIG_DLL(dinput,,[implib,staticimplib],[dinput])
WINE_CONFIG_TEST(dlls/dinput/tests)
-WINE_CONFIG_DLL(dinput8,,[dinput8])
+WINE_CONFIG_DLL(dinput8,,[implib],[dinput8])
WINE_CONFIG_DLL(dispdib.dll16,enable_win16)
WINE_CONFIG_DLL(dispex)
WINE_CONFIG_TEST(dlls/dispex/tests)
@@ -2449,33 +2449,33 @@
WINE_CONFIG_DLL(dmstyle)
WINE_CONFIG_DLL(dmsynth)
WINE_CONFIG_DLL(dmusic)
-WINE_CONFIG_DLL(dmusic32,,[dmusic32])
-WINE_CONFIG_DLL(dnsapi,,[dnsapi])
+WINE_CONFIG_DLL(dmusic32,,[implib],[dmusic32])
+WINE_CONFIG_DLL(dnsapi,,[implib],[dnsapi])
WINE_CONFIG_TEST(dlls/dnsapi/tests)
-WINE_CONFIG_DLL(dplay,,[dplay])
-WINE_CONFIG_DLL(dplayx,,[dplayx])
+WINE_CONFIG_DLL(dplay,,[implib],[dplay])
+WINE_CONFIG_DLL(dplayx,,[implib],[dplayx])
WINE_CONFIG_TEST(dlls/dplayx/tests)
WINE_CONFIG_DLL(dpnaddr)
-WINE_CONFIG_DLL(dpnet,,[dpnet])
+WINE_CONFIG_DLL(dpnet,,[implib],[dpnet])
WINE_CONFIG_DLL(dpnhpast)
WINE_CONFIG_DLL(dpnlobby)
WINE_CONFIG_DLL(dpwsockx)
WINE_CONFIG_DLL(drmclien)
-WINE_CONFIG_DLL(dsound,,[dsound])
+WINE_CONFIG_DLL(dsound,,[implib],[dsound])
WINE_CONFIG_TEST(dlls/dsound/tests)
WINE_CONFIG_DLL(dssenh)
WINE_CONFIG_DLL(dswave)
-WINE_CONFIG_DLL(dwmapi,,[dwmapi])
+WINE_CONFIG_DLL(dwmapi,,[implib],[dwmapi])
WINE_CONFIG_DLL(dxdiagn)
WINE_CONFIG_TEST(dlls/dxdiagn/tests)
WINE_CONFIG_LIB(dxerr8)
WINE_CONFIG_LIB(dxerr9)
-WINE_CONFIG_DLL(dxgi,,[dxgi])
+WINE_CONFIG_DLL(dxgi,,[implib],[dxgi])
WINE_CONFIG_TEST(dlls/dxgi/tests)
WINE_CONFIG_LIB(dxguid)
WINE_CONFIG_DLL(explorerframe)
WINE_CONFIG_TEST(dlls/explorerframe/tests)
-WINE_CONFIG_DLL(faultrep,,[faultrep])
+WINE_CONFIG_DLL(faultrep,,[implib],[faultrep])
WINE_CONFIG_TEST(dlls/faultrep/tests)
WINE_CONFIG_DLL(fltlib)
WINE_CONFIG_DLL(fusion)
@@ -2484,17 +2484,17 @@
WINE_CONFIG_DLL(gameux)
WINE_CONFIG_TEST(dlls/gameux/tests)
WINE_CONFIG_DLL(gdi.exe16,enable_win16)
-WINE_CONFIG_DLL(gdi32,,[gdi32])
+WINE_CONFIG_DLL(gdi32,,[implib],[gdi32])
WINE_CONFIG_TEST(dlls/gdi32/tests)
-WINE_CONFIG_DLL(gdiplus,,[gdiplus])
+WINE_CONFIG_DLL(gdiplus,,[implib],[gdiplus])
WINE_CONFIG_TEST(dlls/gdiplus/tests)
-WINE_CONFIG_DLL(glu32,,[glu32])
+WINE_CONFIG_DLL(glu32,,[implib],[glu32])
WINE_CONFIG_DLL(gphoto2.ds)
WINE_CONFIG_DLL(gpkcsp)
WINE_CONFIG_DLL(hal)
WINE_CONFIG_DLL(hhctrl.ocx)
-WINE_CONFIG_DLL(hid,,[hid])
-WINE_CONFIG_DLL(hlink,,[hlink])
+WINE_CONFIG_DLL(hid,,[implib],[hid])
+WINE_CONFIG_DLL(hlink,,[implib],[hlink])
WINE_CONFIG_TEST(dlls/hlink/tests)
WINE_CONFIG_DLL(hnetcfg)
WINE_CONFIG_DLL(httpapi)
@@ -2502,12 +2502,12 @@
WINE_CONFIG_DLL(icmp)
WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16)
WINE_CONFIG_DLL(imaadp32.acm)
-WINE_CONFIG_DLL(imagehlp,,[imagehlp])
+WINE_CONFIG_DLL(imagehlp,,[implib],[imagehlp])
WINE_CONFIG_TEST(dlls/imagehlp/tests)
WINE_CONFIG_DLL(imm.dll16,enable_win16)
-WINE_CONFIG_DLL(imm32,,[imm32])
+WINE_CONFIG_DLL(imm32,,[implib],[imm32])
WINE_CONFIG_TEST(dlls/imm32/tests)
-WINE_CONFIG_DLL(inetcomm,,[inetcomm])
+WINE_CONFIG_DLL(inetcomm,,[implib],[inetcomm])
WINE_CONFIG_TEST(dlls/inetcomm/tests)
WINE_CONFIG_DLL(inetcpl.cpl)
WINE_CONFIG_DLL(inetmib1)
@@ -2517,27 +2517,27 @@
WINE_CONFIG_DLL(initpki)
WINE_CONFIG_DLL(inkobj)
WINE_CONFIG_DLL(inseng)
-WINE_CONFIG_DLL(iphlpapi,,[iphlpapi])
+WINE_CONFIG_DLL(iphlpapi,,[implib],[iphlpapi])
WINE_CONFIG_TEST(dlls/iphlpapi/tests)
WINE_CONFIG_DLL(itircl)
WINE_CONFIG_DLL(itss)
WINE_CONFIG_TEST(dlls/itss/tests)
WINE_CONFIG_DLL(jscript)
WINE_CONFIG_TEST(dlls/jscript/tests)
-WINE_CONFIG_DLL(kernel32,,[kernel32])
+WINE_CONFIG_DLL(kernel32,,[implib],[kernel32])
WINE_CONFIG_TEST(dlls/kernel32/tests)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
-WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[kernel])
+WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
WINE_CONFIG_DLL(ktmw32)
-WINE_CONFIG_DLL(loadperf,,[loadperf])
+WINE_CONFIG_DLL(loadperf,,[implib],[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,,[lz32])
+WINE_CONFIG_DLL(lz32,,[implib],[lz32])
WINE_CONFIG_TEST(dlls/lz32/tests)
WINE_CONFIG_DLL(lzexpand.dll16,enable_win16)
-WINE_CONFIG_DLL(mapi32,,[mapi32])
+WINE_CONFIG_DLL(mapi32,,[implib],[mapi32])
WINE_CONFIG_TEST(dlls/mapi32/tests)
WINE_CONFIG_DLL(mapistub)
WINE_CONFIG_DLL(mciavi32)
@@ -2546,7 +2546,7 @@
WINE_CONFIG_DLL(mciseq)
WINE_CONFIG_DLL(mciwave)
WINE_CONFIG_DLL(midimap)
-WINE_CONFIG_DLL(mlang,,[mlang])
+WINE_CONFIG_DLL(mlang,,[implib],[mlang])
WINE_CONFIG_TEST(dlls/mlang/tests)
WINE_CONFIG_DLL(mmdevapi)
WINE_CONFIG_TEST(dlls/mmdevapi/tests)
@@ -2555,31 +2555,31 @@
WINE_CONFIG_DLL(monodebg.vxd,enable_win16)
WINE_CONFIG_DLL(mountmgr.sys)
WINE_CONFIG_DLL(mouse.drv16,enable_win16)
-WINE_CONFIG_DLL(mpr,,[mpr])
-WINE_CONFIG_DLL(mprapi,,[mprapi])
+WINE_CONFIG_DLL(mpr,,[implib],[mpr])
+WINE_CONFIG_DLL(mprapi,,[implib],[mprapi])
WINE_CONFIG_DLL(msacm.dll16,enable_win16)
WINE_CONFIG_DLL(msacm32.drv)
-WINE_CONFIG_DLL(msacm32,,[msacm32])
+WINE_CONFIG_DLL(msacm32,,[implib],[msacm32])
WINE_CONFIG_TEST(dlls/msacm32/tests)
WINE_CONFIG_DLL(msadp32.acm)
WINE_CONFIG_DLL(mscat32)
-WINE_CONFIG_DLL(mscms,,[mscms])
+WINE_CONFIG_DLL(mscms,,[implib],[mscms])
WINE_CONFIG_TEST(dlls/mscms/tests)
WINE_CONFIG_DLL(mscoree)
WINE_CONFIG_TEST(dlls/mscoree/tests)
WINE_CONFIG_DLL(msctf)
WINE_CONFIG_TEST(dlls/msctf/tests)
WINE_CONFIG_DLL(msdaps)
-WINE_CONFIG_DLL(msdmo,,[msdmo])
+WINE_CONFIG_DLL(msdmo,,[implib],[msdmo])
WINE_CONFIG_DLL(msftedit)
WINE_CONFIG_DLL(msg711.acm)
WINE_CONFIG_DLL(msgsm32.acm)
WINE_CONFIG_DLL(mshtml.tlb)
-WINE_CONFIG_DLL(mshtml,,[mshtml])
+WINE_CONFIG_DLL(mshtml,,[implib],[mshtml])
WINE_CONFIG_TEST(dlls/mshtml/tests)
-WINE_CONFIG_DLL(msi,,[msi])
+WINE_CONFIG_DLL(msi,,[implib],[msi])
WINE_CONFIG_TEST(dlls/msi/tests)
-WINE_CONFIG_DLL(msimg32,,[msimg32])
+WINE_CONFIG_DLL(msimg32,,[implib],[msimg32])
WINE_CONFIG_DLL(msimtf)
WINE_CONFIG_DLL(msisip)
WINE_CONFIG_DLL(msisys.ocx)
@@ -2594,43 +2594,43 @@
WINE_CONFIG_DLL(msvcp90)
WINE_CONFIG_TEST(dlls/msvcp90/tests)
WINE_CONFIG_DLL(msvcr100)
-WINE_CONFIG_DLL(msvcr70,,[msvcr70])
-WINE_CONFIG_DLL(msvcr71,,[msvcr71])
+WINE_CONFIG_DLL(msvcr70,,[implib],[msvcr70])
+WINE_CONFIG_DLL(msvcr71,,[implib],[msvcr71])
WINE_CONFIG_DLL(msvcr80)
WINE_CONFIG_DLL(msvcr90)
WINE_CONFIG_TEST(dlls/msvcr90/tests)
-WINE_CONFIG_DLL(msvcrt,,[msvcrt])
+WINE_CONFIG_DLL(msvcrt,,[implib],[msvcrt])
WINE_CONFIG_TEST(dlls/msvcrt/tests)
-WINE_CONFIG_DLL(msvcrt20,,[msvcrt20])
-WINE_CONFIG_DLL(msvcrt40,,[msvcrt40])
-WINE_CONFIG_DLL(msvcrtd,,[msvcrtd])
+WINE_CONFIG_DLL(msvcrt20,,[implib],[msvcrt20])
+WINE_CONFIG_DLL(msvcrt40,,[implib],[msvcrt40])
+WINE_CONFIG_DLL(msvcrtd,,[implib],[msvcrtd])
WINE_CONFIG_TEST(dlls/msvcrtd/tests)
-WINE_CONFIG_DLL(msvfw32,,[msvfw32])
+WINE_CONFIG_DLL(msvfw32,,[implib],[msvfw32])
WINE_CONFIG_TEST(dlls/msvfw32/tests)
WINE_CONFIG_DLL(msvidc32)
WINE_CONFIG_DLL(msvideo.dll16,enable_win16)
-WINE_CONFIG_DLL(mswsock,,[mswsock])
+WINE_CONFIG_DLL(mswsock,,[implib],[mswsock])
WINE_CONFIG_DLL(msxml)
WINE_CONFIG_DLL(msxml2)
WINE_CONFIG_DLL(msxml3)
WINE_CONFIG_TEST(dlls/msxml3/tests)
WINE_CONFIG_DLL(msxml4)
WINE_CONFIG_DLL(msxml6)
-WINE_CONFIG_DLL(nddeapi,,[nddeapi])
-WINE_CONFIG_DLL(netapi32,,[netapi32])
+WINE_CONFIG_DLL(nddeapi,,[implib],[nddeapi])
+WINE_CONFIG_DLL(netapi32,,[implib],[netapi32])
WINE_CONFIG_TEST(dlls/netapi32/tests)
-WINE_CONFIG_DLL(newdev,,[newdev])
+WINE_CONFIG_DLL(newdev,,[implib],[newdev])
WINE_CONFIG_DLL(npmshtml)
-WINE_CONFIG_DLL(ntdll,,[ntdll])
+WINE_CONFIG_DLL(ntdll,,[implib],[ntdll])
WINE_CONFIG_TEST(dlls/ntdll/tests)
-WINE_CONFIG_DLL(ntdsapi,,[ntdsapi])
+WINE_CONFIG_DLL(ntdsapi,,[implib],[ntdsapi])
WINE_CONFIG_TEST(dlls/ntdsapi/tests)
-WINE_CONFIG_DLL(ntoskrnl.exe,,[ntoskrnl.exe])
+WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl.exe])
WINE_CONFIG_DLL(ntprint)
WINE_CONFIG_TEST(dlls/ntprint/tests)
WINE_CONFIG_DLL(objsel)
-WINE_CONFIG_DLL(odbc32,,[odbc32])
-WINE_CONFIG_DLL(odbccp32,,[odbccp32])
+WINE_CONFIG_DLL(odbc32,,[implib],[odbc32])
+WINE_CONFIG_DLL(odbccp32,,[implib],[odbccp32])
WINE_CONFIG_TEST(dlls/odbccp32/tests)
WINE_CONFIG_DLL(ole2.dll16,enable_win16)
WINE_CONFIG_DLL(ole2conv.dll16,enable_win16)
@@ -2638,33 +2638,33 @@
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,,[ole32])
+WINE_CONFIG_DLL(ole32,,[implib],[ole32])
WINE_CONFIG_TEST(dlls/ole32/tests)
-WINE_CONFIG_DLL(oleacc,,[oleacc])
+WINE_CONFIG_DLL(oleacc,,[implib],[oleacc])
WINE_CONFIG_TEST(dlls/oleacc/tests)
-WINE_CONFIG_DLL(oleaut32,,[oleaut32])
+WINE_CONFIG_DLL(oleaut32,,[implib],[oleaut32])
WINE_CONFIG_TEST(dlls/oleaut32/tests)
WINE_CONFIG_DLL(olecli.dll16,enable_win16)
-WINE_CONFIG_DLL(olecli32,,[olecli32])
+WINE_CONFIG_DLL(olecli32,,[implib],[olecli32])
WINE_CONFIG_DLL(oledb32)
WINE_CONFIG_TEST(dlls/oledb32/tests)
-WINE_CONFIG_DLL(oledlg,,[oledlg])
-WINE_CONFIG_DLL(olepro32,,[olepro32])
+WINE_CONFIG_DLL(oledlg,,[implib],[oledlg])
+WINE_CONFIG_DLL(olepro32,,[implib],[olepro32])
WINE_CONFIG_DLL(olesvr.dll16,enable_win16)
-WINE_CONFIG_DLL(olesvr32,,[olesvr32])
+WINE_CONFIG_DLL(olesvr32,,[implib],[olesvr32])
WINE_CONFIG_DLL(olethk32)
WINE_CONFIG_DLL(openal32)
WINE_CONFIG_DLL(opencl)
-WINE_CONFIG_DLL(opengl32,,[opengl32])
+WINE_CONFIG_DLL(opengl32,,[implib],[opengl32])
WINE_CONFIG_TEST(dlls/opengl32/tests)
-WINE_CONFIG_DLL(pdh,,[pdh])
+WINE_CONFIG_DLL(pdh,,[implib],[pdh])
WINE_CONFIG_TEST(dlls/pdh/tests)
WINE_CONFIG_DLL(pidgen)
-WINE_CONFIG_DLL(powrprof,,[powrprof])
+WINE_CONFIG_DLL(powrprof,,[implib],[powrprof])
WINE_CONFIG_DLL(printui)
-WINE_CONFIG_DLL(propsys,,[propsys])
+WINE_CONFIG_DLL(propsys,,[implib],[propsys])
WINE_CONFIG_TEST(dlls/propsys/tests)
-WINE_CONFIG_DLL(psapi,,[psapi])
+WINE_CONFIG_DLL(psapi,,[implib],[psapi])
WINE_CONFIG_TEST(dlls/psapi/tests)
WINE_CONFIG_DLL(pstorec)
WINE_CONFIG_DLL(qcap)
@@ -2673,61 +2673,61 @@
WINE_CONFIG_DLL(qmgr)
WINE_CONFIG_TEST(dlls/qmgr/tests)
WINE_CONFIG_DLL(qmgrprxy)
-WINE_CONFIG_DLL(quartz,,[quartz])
+WINE_CONFIG_DLL(quartz,,[implib],[quartz])
WINE_CONFIG_TEST(dlls/quartz/tests)
WINE_CONFIG_DLL(query)
WINE_CONFIG_DLL(rasapi16.dll16,enable_win16)
-WINE_CONFIG_DLL(rasapi32,,[rasapi32])
+WINE_CONFIG_DLL(rasapi32,,[implib],[rasapi32])
WINE_CONFIG_TEST(dlls/rasapi32/tests)
-WINE_CONFIG_DLL(rasdlg,,[rasdlg])
-WINE_CONFIG_DLL(resutils,,[resutils])
-WINE_CONFIG_DLL(riched20,,[riched20])
+WINE_CONFIG_DLL(rasdlg,,[implib],[rasdlg])
+WINE_CONFIG_DLL(resutils,,[implib],[resutils])
+WINE_CONFIG_DLL(riched20,,[implib],[riched20])
WINE_CONFIG_TEST(dlls/riched20/tests)
WINE_CONFIG_DLL(riched32)
WINE_CONFIG_TEST(dlls/riched32/tests)
-WINE_CONFIG_DLL(rpcrt4,,[rpcrt4])
+WINE_CONFIG_DLL(rpcrt4,,[implib],[rpcrt4])
WINE_CONFIG_TEST(dlls/rpcrt4/tests)
WINE_CONFIG_DLL(rsabase)
-WINE_CONFIG_DLL(rsaenh,,[rsaenh])
+WINE_CONFIG_DLL(rsaenh,,[implib],[rsaenh])
WINE_CONFIG_TEST(dlls/rsaenh/tests)
WINE_CONFIG_DLL(rstrtmgr)
-WINE_CONFIG_DLL(rtutils,,[rtutils])
+WINE_CONFIG_DLL(rtutils,,[implib],[rtutils])
WINE_CONFIG_DLL(samlib)
WINE_CONFIG_DLL(sane.ds)
WINE_CONFIG_DLL(sccbase)
WINE_CONFIG_DLL(schannel)
WINE_CONFIG_TEST(dlls/schannel/tests)
-WINE_CONFIG_DLL(secur32,,[secur32])
+WINE_CONFIG_DLL(secur32,,[implib],[secur32])
WINE_CONFIG_TEST(dlls/secur32/tests)
WINE_CONFIG_DLL(security)
-WINE_CONFIG_DLL(sensapi,,[sensapi])
-WINE_CONFIG_DLL(serialui,,[serialui])
+WINE_CONFIG_DLL(sensapi,,[implib],[sensapi])
+WINE_CONFIG_DLL(serialui,,[implib],[serialui])
WINE_CONFIG_TEST(dlls/serialui/tests)
-WINE_CONFIG_DLL(setupapi,,[setupapi])
+WINE_CONFIG_DLL(setupapi,,[implib],[setupapi])
WINE_CONFIG_TEST(dlls/setupapi/tests)
WINE_CONFIG_DLL(setupx.dll16,enable_win16)
-WINE_CONFIG_DLL(sfc,,[sfc])
-WINE_CONFIG_DLL(sfc_os,,[sfc_os])
+WINE_CONFIG_DLL(sfc,,[implib],[sfc])
+WINE_CONFIG_DLL(sfc_os,,[implib],[sfc_os])
WINE_CONFIG_DLL(shdoclc)
-WINE_CONFIG_DLL(shdocvw,,[shdocvw])
+WINE_CONFIG_DLL(shdocvw,,[implib],[shdocvw])
WINE_CONFIG_TEST(dlls/shdocvw/tests)
WINE_CONFIG_DLL(shell.dll16,enable_win16)
-WINE_CONFIG_DLL(shell32,,[shell32])
+WINE_CONFIG_DLL(shell32,,[implib],[shell32])
WINE_CONFIG_TEST(dlls/shell32/tests)
-WINE_CONFIG_DLL(shfolder,,[shfolder])
-WINE_CONFIG_DLL(shlwapi,,[shlwapi])
+WINE_CONFIG_DLL(shfolder,,[implib],[shfolder])
+WINE_CONFIG_DLL(shlwapi,,[implib],[shlwapi])
WINE_CONFIG_TEST(dlls/shlwapi/tests)
WINE_CONFIG_DLL(slbcsp)
-WINE_CONFIG_DLL(slc,,[slc])
-WINE_CONFIG_DLL(snmpapi,,[snmpapi])
+WINE_CONFIG_DLL(slc,,[implib],[slc])
+WINE_CONFIG_DLL(snmpapi,,[implib],[snmpapi])
WINE_CONFIG_TEST(dlls/snmpapi/tests)
WINE_CONFIG_DLL(softpub)
WINE_CONFIG_DLL(sound.drv16,enable_win16)
-WINE_CONFIG_DLL(spoolss,,[spoolss])
+WINE_CONFIG_DLL(spoolss,,[implib],[spoolss])
WINE_CONFIG_TEST(dlls/spoolss/tests)
WINE_CONFIG_DLL(stdole2.tlb)
WINE_CONFIG_DLL(stdole32.tlb)
-WINE_CONFIG_DLL(sti,,[sti])
+WINE_CONFIG_DLL(sti,,[implib],[sti])
WINE_CONFIG_TEST(dlls/sti/tests)
WINE_CONFIG_DLL(storage.dll16,enable_win16)
WINE_CONFIG_DLL(stress.dll16,enable_win16)
@@ -2737,33 +2737,33 @@
WINE_CONFIG_DLL(sxs)
WINE_CONFIG_DLL(system.drv16,enable_win16)
WINE_CONFIG_DLL(t2embed)
-WINE_CONFIG_DLL(tapi32,,[tapi32])
+WINE_CONFIG_DLL(tapi32,,[implib],[tapi32])
WINE_CONFIG_DLL(toolhelp.dll16,enable_win16)
WINE_CONFIG_DLL(traffic)
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(unicows,,[unicows])
+WINE_CONFIG_DLL(unicows,,[implib],[unicows])
WINE_CONFIG_DLL(updspapi)
-WINE_CONFIG_DLL(url,,[url])
-WINE_CONFIG_DLL(urlmon,,[urlmon])
+WINE_CONFIG_DLL(url,,[implib],[url])
+WINE_CONFIG_DLL(urlmon,,[implib],[urlmon])
WINE_CONFIG_TEST(dlls/urlmon/tests)
-WINE_CONFIG_DLL(usbd.sys,,[usbd.sys])
+WINE_CONFIG_DLL(usbd.sys,,[implib],[usbd.sys])
WINE_CONFIG_DLL(user.exe16,enable_win16)
-WINE_CONFIG_DLL(user32,,[user32])
+WINE_CONFIG_DLL(user32,,[implib],[user32])
WINE_CONFIG_TEST(dlls/user32/tests)
-WINE_CONFIG_DLL(userenv,,[userenv])
+WINE_CONFIG_DLL(userenv,,[implib],[userenv])
WINE_CONFIG_TEST(dlls/userenv/tests)
-WINE_CONFIG_DLL(usp10,,[usp10])
+WINE_CONFIG_DLL(usp10,,[implib],[usp10])
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
-WINE_CONFIG_DLL(uxtheme,,[uxtheme])
+WINE_CONFIG_DLL(uxtheme,,[implib],[uxtheme])
WINE_CONFIG_TEST(dlls/uxtheme/tests)
WINE_CONFIG_DLL(vdhcp.vxd,enable_win16)
-WINE_CONFIG_DLL(vdmdbg,,[vdmdbg])
+WINE_CONFIG_DLL(vdmdbg,,[implib],[vdmdbg])
WINE_CONFIG_DLL(ver.dll16,enable_win16)
-WINE_CONFIG_DLL(version,,[version])
+WINE_CONFIG_DLL(version,,[implib],[version])
WINE_CONFIG_TEST(dlls/version/tests)
WINE_CONFIG_DLL(vmm.vxd,enable_win16)
WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
@@ -2773,19 +2773,19 @@
WINE_CONFIG_DLL(w32skrnl,enable_win16)
WINE_CONFIG_DLL(w32sys.dll16,enable_win16)
WINE_CONFIG_DLL(wbemprox)
-WINE_CONFIG_DLL(wer,,[wer])
+WINE_CONFIG_DLL(wer,,[implib],[wer])
WINE_CONFIG_TEST(dlls/wer/tests)
WINE_CONFIG_DLL(wiaservc)
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,,[windowscodecs])
+WINE_CONFIG_DLL(windowscodecs,,[implib],[windowscodecs])
WINE_CONFIG_TEST(dlls/windowscodecs/tests)
WINE_CONFIG_DLL(winealsa.drv)
WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0)
-WINE_CONFIG_DLL(wined3d,,[wined3d])
+WINE_CONFIG_DLL(wined3d,,[implib],[wined3d])
WINE_CONFIG_DLL(wineesd.drv)
WINE_CONFIG_DLL(winegstreamer)
WINE_CONFIG_DLL(winejack.drv)
@@ -2801,40 +2801,40 @@
WINE_CONFIG_DLL(winex11.drv)
WINE_CONFIG_DLL(wing.dll16,enable_win16)
WINE_CONFIG_DLL(wing32)
-WINE_CONFIG_DLL(winhttp,,[winhttp])
+WINE_CONFIG_DLL(winhttp,,[implib],[winhttp])
WINE_CONFIG_TEST(dlls/winhttp/tests)
-WINE_CONFIG_DLL(wininet,,[wininet])
+WINE_CONFIG_DLL(wininet,,[implib],[wininet])
WINE_CONFIG_TEST(dlls/wininet/tests)
-WINE_CONFIG_DLL(winmm,,[winmm])
+WINE_CONFIG_DLL(winmm,,[implib],[winmm])
WINE_CONFIG_TEST(dlls/winmm/tests)
WINE_CONFIG_DLL(winnls.dll16,enable_win16)
-WINE_CONFIG_DLL(winnls32,,[winnls32])
-WINE_CONFIG_DLL(winscard,,[winscard])
+WINE_CONFIG_DLL(winnls32,,[implib],[winnls32])
+WINE_CONFIG_DLL(winscard,,[implib],[winscard])
WINE_CONFIG_DLL(winsock.dll16,enable_win16)
-WINE_CONFIG_DLL(winspool.drv,,[winspool])
+WINE_CONFIG_DLL(winspool.drv,,[implib],[winspool])
WINE_CONFIG_TEST(dlls/winspool.drv/tests)
WINE_CONFIG_DLL(wintab.dll16,enable_win16)
-WINE_CONFIG_DLL(wintab32,,[wintab32])
+WINE_CONFIG_DLL(wintab32,,[implib],[wintab32])
WINE_CONFIG_TEST(dlls/wintab32/tests)
-WINE_CONFIG_DLL(wintrust,,[wintrust])
+WINE_CONFIG_DLL(wintrust,,[implib],[wintrust])
WINE_CONFIG_TEST(dlls/wintrust/tests)
WINE_CONFIG_DLL(wlanapi)
-WINE_CONFIG_DLL(wldap32,,[wldap32])
+WINE_CONFIG_DLL(wldap32,,[implib],[wldap32])
WINE_CONFIG_TEST(dlls/wldap32/tests)
WINE_CONFIG_DLL(wmi)
WINE_CONFIG_DLL(wmiutils)
-WINE_CONFIG_DLL(wnaspi32,,[wnaspi32])
-WINE_CONFIG_DLL(wow32,enable_win16,[wow32])
-WINE_CONFIG_DLL(ws2_32,,[ws2_32])
+WINE_CONFIG_DLL(wnaspi32,,[implib],[wnaspi32])
+WINE_CONFIG_DLL(wow32,enable_win16,[implib],[wow32])
+WINE_CONFIG_DLL(ws2_32,,[implib],[ws2_32])
WINE_CONFIG_TEST(dlls/ws2_32/tests)
-WINE_CONFIG_DLL(wsock32,,[wsock32])
-WINE_CONFIG_DLL(wtsapi32,,[wtsapi32])
+WINE_CONFIG_DLL(wsock32,,[implib],[wsock32])
+WINE_CONFIG_DLL(wtsapi32,,[implib],[wtsapi32])
WINE_CONFIG_DLL(wuapi)
WINE_CONFIG_DLL(wuaueng)
WINE_CONFIG_DLL(xapofx1_1)
WINE_CONFIG_DLL(xinput1_1)
WINE_CONFIG_DLL(xinput1_2)
-WINE_CONFIG_DLL(xinput1_3,,[xinput])
+WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput])
WINE_CONFIG_TEST(dlls/xinput1_3/tests)
WINE_CONFIG_DLL(xinput9_1_0)
WINE_CONFIG_DLL(xmllite)
@@ -2846,76 +2846,76 @@
WINE_CONFIG_MAKEFILE([libs/wine])
WINE_CONFIG_MAKEFILE([libs/wpp])
WINE_CONFIG_MAKEFILE([loader])
-WINE_CONFIG_PROGRAM(aspnet_regiis,install)
-WINE_CONFIG_PROGRAM(attrib,install)
-WINE_CONFIG_PROGRAM(cacls,install)
-WINE_CONFIG_PROGRAM(clock,install)
-WINE_CONFIG_PROGRAM(cmd,install)
+WINE_CONFIG_PROGRAM(aspnet_regiis,,[install])
+WINE_CONFIG_PROGRAM(attrib,,[install])
+WINE_CONFIG_PROGRAM(cacls,,[install])
+WINE_CONFIG_PROGRAM(clock,,[install])
+WINE_CONFIG_PROGRAM(cmd,,[install])
WINE_CONFIG_TEST(programs/cmd/tests)
WINE_CONFIG_PROGRAM(cmdlgtst)
-WINE_CONFIG_PROGRAM(control,install)
-WINE_CONFIG_PROGRAM(dxdiag,install)
-WINE_CONFIG_PROGRAM(eject,install)
-WINE_CONFIG_PROGRAM(expand,install)
-WINE_CONFIG_PROGRAM(explorer,install)
-WINE_CONFIG_PROGRAM(extrac32,install)
-WINE_CONFIG_PROGRAM(hh,install)
-WINE_CONFIG_PROGRAM(icinfo,install)
-WINE_CONFIG_PROGRAM(iexplore,install)
-WINE_CONFIG_PROGRAM(ipconfig,install)
-WINE_CONFIG_PROGRAM(lodctr,install)
-WINE_CONFIG_PROGRAM(mofcomp,install)
-WINE_CONFIG_PROGRAM(mshta,install)
-WINE_CONFIG_PROGRAM(msiexec,installbin)
-WINE_CONFIG_PROGRAM(net,install)
-WINE_CONFIG_PROGRAM(netsh,install)
-WINE_CONFIG_PROGRAM(ngen,install)
-WINE_CONFIG_PROGRAM(notepad,installbin)
-WINE_CONFIG_PROGRAM(oleview,install)
-WINE_CONFIG_PROGRAM(ping,install)
-WINE_CONFIG_PROGRAM(progman,install)
-WINE_CONFIG_PROGRAM(reg,install)
-WINE_CONFIG_PROGRAM(regedit,installbin)
+WINE_CONFIG_PROGRAM(control,,[install])
+WINE_CONFIG_PROGRAM(dxdiag,,[install])
+WINE_CONFIG_PROGRAM(eject,,[install])
+WINE_CONFIG_PROGRAM(expand,,[install])
+WINE_CONFIG_PROGRAM(explorer,,[install])
+WINE_CONFIG_PROGRAM(extrac32,,[install])
+WINE_CONFIG_PROGRAM(hh,,[install])
+WINE_CONFIG_PROGRAM(icinfo,,[install])
+WINE_CONFIG_PROGRAM(iexplore,,[install])
+WINE_CONFIG_PROGRAM(ipconfig,,[install])
+WINE_CONFIG_PROGRAM(lodctr,,[install])
+WINE_CONFIG_PROGRAM(mofcomp,,[install])
+WINE_CONFIG_PROGRAM(mshta,,[install])
+WINE_CONFIG_PROGRAM(msiexec,,[install,installbin])
+WINE_CONFIG_PROGRAM(net,,[install])
+WINE_CONFIG_PROGRAM(netsh,,[install])
+WINE_CONFIG_PROGRAM(ngen,,[install])
+WINE_CONFIG_PROGRAM(notepad,,[install,installbin])
+WINE_CONFIG_PROGRAM(oleview,,[install])
+WINE_CONFIG_PROGRAM(ping,,[install])
+WINE_CONFIG_PROGRAM(progman,,[install])
+WINE_CONFIG_PROGRAM(reg,,[install])
+WINE_CONFIG_PROGRAM(regedit,,[install,installbin])
WINE_CONFIG_TEST(programs/regedit/tests)
-WINE_CONFIG_PROGRAM(regsvcs,install)
-WINE_CONFIG_PROGRAM(regsvr32,installbin)
-WINE_CONFIG_PROGRAM(rpcss,install)
-WINE_CONFIG_PROGRAM(rundll.exe16,install,enable_win16)
-WINE_CONFIG_PROGRAM(rundll32,install)
-WINE_CONFIG_PROGRAM(sc,install)
-WINE_CONFIG_PROGRAM(secedit,install)
-WINE_CONFIG_PROGRAM(servicemodelreg,install)
-WINE_CONFIG_PROGRAM(services,install)
-WINE_CONFIG_PROGRAM(spoolsv,install)
-WINE_CONFIG_PROGRAM(start,install)
-WINE_CONFIG_PROGRAM(svchost,install)
-WINE_CONFIG_PROGRAM(taskkill,install)
-WINE_CONFIG_PROGRAM(taskmgr,install)
-WINE_CONFIG_PROGRAM(termsv,install)
-WINE_CONFIG_PROGRAM(uninstaller,install)
-WINE_CONFIG_PROGRAM(unlodctr,install)
+WINE_CONFIG_PROGRAM(regsvcs,,[install])
+WINE_CONFIG_PROGRAM(regsvr32,,[install,installbin])
+WINE_CONFIG_PROGRAM(rpcss,,[install])
+WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install])
+WINE_CONFIG_PROGRAM(rundll32,,[install])
+WINE_CONFIG_PROGRAM(sc,,[install])
+WINE_CONFIG_PROGRAM(secedit,,[install])
+WINE_CONFIG_PROGRAM(servicemodelreg,,[install])
+WINE_CONFIG_PROGRAM(services,,[install])
+WINE_CONFIG_PROGRAM(spoolsv,,[install])
+WINE_CONFIG_PROGRAM(start,,[install])
+WINE_CONFIG_PROGRAM(svchost,,[install])
+WINE_CONFIG_PROGRAM(taskkill,,[install])
+WINE_CONFIG_PROGRAM(taskmgr,,[install])
+WINE_CONFIG_PROGRAM(termsv,,[install])
+WINE_CONFIG_PROGRAM(uninstaller,,[install])
+WINE_CONFIG_PROGRAM(unlodctr,,[install])
WINE_CONFIG_PROGRAM(view)
-WINE_CONFIG_PROGRAM(wineboot,installbin)
-WINE_CONFIG_PROGRAM(winebrowser,install)
-WINE_CONFIG_PROGRAM(winecfg,installbin)
-WINE_CONFIG_PROGRAM(wineconsole,installbin)
-WINE_CONFIG_PROGRAM(winedbg,installbin)
-WINE_CONFIG_PROGRAM(winedevice,install)
-WINE_CONFIG_PROGRAM(winefile,installbin)
-WINE_CONFIG_PROGRAM(winemenubuilder,install)
-WINE_CONFIG_PROGRAM(winemine,installbin)
-WINE_CONFIG_PROGRAM(winepath,installbin)
+WINE_CONFIG_PROGRAM(wineboot,,[install,installbin])
+WINE_CONFIG_PROGRAM(winebrowser,,[install])
+WINE_CONFIG_PROGRAM(winecfg,,[install,installbin])
+WINE_CONFIG_PROGRAM(wineconsole,,[install,installbin])
+WINE_CONFIG_PROGRAM(winedbg,,[install,installbin])
+WINE_CONFIG_PROGRAM(winedevice,,[install])
+WINE_CONFIG_PROGRAM(winefile,,[install,installbin])
+WINE_CONFIG_PROGRAM(winemenubuilder,,[install])
+WINE_CONFIG_PROGRAM(winemine,,[install,installbin])
+WINE_CONFIG_PROGRAM(winepath,,[install,installbin])
WINE_CONFIG_PROGRAM(winetest)
-WINE_CONFIG_PROGRAM(winevdm,install,enable_win16)
-WINE_CONFIG_PROGRAM(winhelp.exe16,install,enable_win16)
-WINE_CONFIG_PROGRAM(winhlp32,install)
-WINE_CONFIG_PROGRAM(winoldap.mod16,install,enable_win16)
-WINE_CONFIG_PROGRAM(winver,install)
-WINE_CONFIG_PROGRAM(wmic,install)
-WINE_CONFIG_PROGRAM(wordpad,install)
-WINE_CONFIG_PROGRAM(write,install)
-WINE_CONFIG_PROGRAM(wscript,install)
-WINE_CONFIG_PROGRAM(xcopy,install)
+WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install])
+WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install])
+WINE_CONFIG_PROGRAM(winhlp32,,[install])
+WINE_CONFIG_PROGRAM(winoldap.mod16,enable_win16,[install])
+WINE_CONFIG_PROGRAM(winver,,[install])
+WINE_CONFIG_PROGRAM(wmic,,[install])
+WINE_CONFIG_PROGRAM(wordpad,,[install])
+WINE_CONFIG_PROGRAM(write,,[install])
+WINE_CONFIG_PROGRAM(wscript,,[install])
+WINE_CONFIG_PROGRAM(xcopy,,[install])
WINE_CONFIG_MAKEFILE([server])
WINE_CONFIG_TOOL(tools)
WINE_CONFIG_TOOL(tools/widl)
