Skip to content
Snippets Groups Projects
Commit 950a0f87 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

makefiles: Generate the import library rules from configure.

parent b6c275b1
No related branches found
No related tags found
No related merge requests found
......@@ -191,10 +191,32 @@ m4_popdef([ac_dir])])
dnl **** Create a dll makefile from config.status ****
dnl
dnl Usage: WINE_CONFIG_DLL(name,enable)
dnl Usage: WINE_CONFIG_DLL(name,enable,implib,implibsrc)
dnl
AC_DEFUN([WINE_CONFIG_DLL],
[WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[$2])])
[m4_ifval([$3],[m4_ifval([$2],[test "x$[$2]" = xno || ])ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\
$1/lib$3.$IMPLIBEXT[]dnl
m4_if($1,$3,,[ \\
lib$3.$IMPLIBEXT])[]dnl
m4_ifval([$4],[ \\
$1/lib$3.$STATIC_IMPLIBEXT])"
ALL_IMPORTLIB_RULES="$ALL_IMPORTLIB_RULES
m4_if($1,$3,,[lib$3.a: $1/lib$3.a
\$(RM) \$[@] && \$(LN_S) $1/lib$3.a \$[@]
lib$3.cross.a: $1/lib$3.cross.a
\$(RM) \$[@] && \$(LN_S) $1/lib$3.cross.a \$[@]
lib$3.def: $1/lib$3.def
\$(RM) \$[@] && \$(LN_S) $1/lib$3.def \$[@]
clean::
\$(RM) lib$3.def
])m4_ifval([$4],[$1/lib$3.def: $1/$1.spec \$(WINEBUILD)
@cd $1 && \$(MAKE) \`basename \$[@]\`
$1/lib$3.$STATIC_IMPLIBEXT $1/lib$3.cross.a: dummy
@cd $1 && \$(MAKE) \`basename \$[@]\`],
[$1/lib$3.def $1/lib$3.a $1/lib$3.cross.a: $1/$1.spec \$(WINEBUILD)
@cd $1 && \$(MAKE) \`basename \$[@]\`])"
])dnl
WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[$2])])
dnl **** Create a program makefile from config.status ****
dnl
......
This diff is collapsed.
......@@ -583,6 +583,7 @@ AC_SUBST(LIBEXT,"so")
AC_SUBST(IMPLIBEXT,"def")
AC_SUBST(LDRPATH_INSTALL,"")
AC_SUBST(LDRPATH_LOCAL,"")
STATIC_IMPLIBEXT="def.a"
WINE_PATH_LDD
case $host_os in
......@@ -596,6 +597,7 @@ case $host_os in
LIBEXT="dll"
fi
IMPLIBEXT="a"
STATIC_IMPLIBEXT="a"
dnl Disable modules that can't be used on Windows
enable_iphlpapi=${enable_iphlpapi:-no}
enable_kernel32=${enable_kernel32:-no}
......@@ -2092,6 +2094,7 @@ AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_IMPLIB_DIRS,"")
AC_SUBST(ALL_STATIC_LIBS,"")
AC_SUBST(ALL_IMPORT_LIBS,"")
AC_SUBST(ALL_IMPORTLIB_RULES,"")
AC_SUBST(ALL_TEST_DIRS,"")
AC_SUBST(ALL_PROGRAM_DIRS,"")
......@@ -2118,68 +2121,68 @@ WINE_CONFIG_MAKERULES([programs/Makeprog.rules],[MAKE_PROG_RULES],[Make.rules])
WINE_CONFIG_MAKEFILE([Makefile],[Make.rules])
WINE_CONFIG_MAKEFILE([dlls/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
WINE_CONFIG_DLL(acledit)
WINE_CONFIG_DLL(aclui)
WINE_CONFIG_DLL(activeds)
WINE_CONFIG_DLL(aclui,,[aclui])
WINE_CONFIG_DLL(activeds,,[activeds])
WINE_CONFIG_DLL(actxprxy)
WINE_CONFIG_LIB(adsiid)
WINE_CONFIG_DLL(advapi32)
WINE_CONFIG_DLL(advapi32,,[advapi32])
WINE_CONFIG_TEST(dlls/advapi32/tests)
WINE_CONFIG_DLL(advpack)
WINE_CONFIG_DLL(advpack,,[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)
WINE_CONFIG_DLL(atl,,[atl])
WINE_CONFIG_DLL(authz)
WINE_CONFIG_DLL(avicap32)
WINE_CONFIG_DLL(avifil32)
WINE_CONFIG_DLL(avicap32,,[avicap32])
WINE_CONFIG_DLL(avifil32,,[avifil32])
WINE_CONFIG_TEST(dlls/avifil32/tests)
WINE_CONFIG_DLL(avifile.dll16,enable_win16)
WINE_CONFIG_DLL(avrt)
WINE_CONFIG_DLL(avrt,,[avrt])
WINE_CONFIG_DLL(bcrypt)
WINE_CONFIG_DLL(browseui)
WINE_CONFIG_TEST(dlls/browseui/tests)
WINE_CONFIG_DLL(cabinet)
WINE_CONFIG_DLL(cabinet,,[cabinet])
WINE_CONFIG_TEST(dlls/cabinet/tests)
WINE_CONFIG_DLL(capi2032)
WINE_CONFIG_DLL(cards)
WINE_CONFIG_DLL(cfgmgr32)
WINE_CONFIG_DLL(clusapi)
WINE_CONFIG_DLL(capi2032,,[capi2032])
WINE_CONFIG_DLL(cards,,[cards])
WINE_CONFIG_DLL(cfgmgr32,,[cfgmgr32])
WINE_CONFIG_DLL(clusapi,,[clusapi])
WINE_CONFIG_DLL(comcat)
WINE_CONFIG_TEST(dlls/comcat/tests)
WINE_CONFIG_DLL(comctl32)
WINE_CONFIG_DLL(comctl32,,[comctl32])
WINE_CONFIG_TEST(dlls/comctl32/tests)
WINE_CONFIG_DLL(comdlg32)
WINE_CONFIG_DLL(comdlg32,,[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)
WINE_CONFIG_DLL(credui)
WINE_CONFIG_DLL(compstui,,[compstui])
WINE_CONFIG_DLL(credui,,[credui])
WINE_CONFIG_TEST(dlls/credui/tests)
WINE_CONFIG_DLL(crtdll)
WINE_CONFIG_DLL(crypt32)
WINE_CONFIG_DLL(crtdll,,[crtdll])
WINE_CONFIG_DLL(crypt32,,[crypt32])
WINE_CONFIG_TEST(dlls/crypt32/tests)
WINE_CONFIG_DLL(cryptdlg)
WINE_CONFIG_DLL(cryptdll)
WINE_CONFIG_DLL(cryptnet)
WINE_CONFIG_DLL(cryptdll,,[cryptdll])
WINE_CONFIG_DLL(cryptnet,,[cryptnet])
WINE_CONFIG_TEST(dlls/cryptnet/tests)
WINE_CONFIG_DLL(cryptui)
WINE_CONFIG_DLL(cryptui,,[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(ctl3d32,,[ctl3d32])
WINE_CONFIG_DLL(ctl3dv2.dll16,enable_win16)
WINE_CONFIG_DLL(d3d10)
WINE_CONFIG_DLL(d3d10,,[d3d10])
WINE_CONFIG_TEST(dlls/d3d10/tests)
WINE_CONFIG_DLL(d3d10core)
WINE_CONFIG_DLL(d3d10core,,[d3d10core])
WINE_CONFIG_TEST(dlls/d3d10core/tests)
WINE_CONFIG_DLL(d3d8)
WINE_CONFIG_DLL(d3d8,,[d3d8])
WINE_CONFIG_TEST(dlls/d3d8/tests)
WINE_CONFIG_DLL(d3d9)
WINE_CONFIG_DLL(d3d9,,[d3d9])
WINE_CONFIG_TEST(dlls/d3d9/tests)
WINE_CONFIG_DLL(d3dim)
WINE_CONFIG_DLL(d3drm)
WINE_CONFIG_DLL(d3dim,,[d3dim])
WINE_CONFIG_DLL(d3drm,,[d3drm])
WINE_CONFIG_TEST(dlls/d3drm/tests)
WINE_CONFIG_DLL(d3dx9_24)
WINE_CONFIG_DLL(d3dx9_25)
......@@ -2193,7 +2196,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)
WINE_CONFIG_DLL(d3dx9_36,,[d3dx9])
WINE_CONFIG_TEST(dlls/d3dx9_36/tests)
WINE_CONFIG_DLL(d3dx9_37)
WINE_CONFIG_DLL(d3dx9_38)
......@@ -2201,19 +2204,19 @@ WINE_CONFIG_DLL(d3dx9_39)
WINE_CONFIG_DLL(d3dx9_40)
WINE_CONFIG_DLL(d3dx9_41)
WINE_CONFIG_DLL(d3dx9_42)
WINE_CONFIG_DLL(d3dxof)
WINE_CONFIG_DLL(d3dxof,,[d3dxof])
WINE_CONFIG_TEST(dlls/d3dxof/tests)
WINE_CONFIG_DLL(dbghelp)
WINE_CONFIG_DLL(dciman32)
WINE_CONFIG_DLL(dbghelp,,[dbghelp])
WINE_CONFIG_DLL(dciman32,,[dciman32])
WINE_CONFIG_DLL(ddeml.dll16,enable_win16)
WINE_CONFIG_DLL(ddraw)
WINE_CONFIG_DLL(ddraw,,[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)
WINE_CONFIG_DLL(dinput,,[dinput],[data_formats.c])
WINE_CONFIG_TEST(dlls/dinput/tests)
WINE_CONFIG_DLL(dinput8)
WINE_CONFIG_DLL(dinput8,,[dinput8])
WINE_CONFIG_DLL(dispdib.dll16,enable_win16)
WINE_CONFIG_DLL(display.drv16,enable_win16)
WINE_CONFIG_DLL(dmband)
......@@ -2225,28 +2228,28 @@ WINE_CONFIG_DLL(dmscript)
WINE_CONFIG_DLL(dmstyle)
WINE_CONFIG_DLL(dmsynth)
WINE_CONFIG_DLL(dmusic)
WINE_CONFIG_DLL(dmusic32)
WINE_CONFIG_DLL(dnsapi)
WINE_CONFIG_DLL(dmusic32,,[dmusic32])
WINE_CONFIG_DLL(dnsapi,,[dnsapi])
WINE_CONFIG_TEST(dlls/dnsapi/tests)
WINE_CONFIG_DLL(dplay)
WINE_CONFIG_DLL(dplayx)
WINE_CONFIG_DLL(dplay,,[dplay])
WINE_CONFIG_DLL(dplayx,,[dplayx])
WINE_CONFIG_TEST(dlls/dplayx/tests)
WINE_CONFIG_DLL(dpnaddr)
WINE_CONFIG_DLL(dpnet)
WINE_CONFIG_DLL(dpnet,,[dpnet])
WINE_CONFIG_DLL(dpnhpast)
WINE_CONFIG_DLL(dpnlobby)
WINE_CONFIG_DLL(dpwsockx)
WINE_CONFIG_DLL(drmclien)
WINE_CONFIG_DLL(dsound)
WINE_CONFIG_DLL(dsound,,[dsound])
WINE_CONFIG_TEST(dlls/dsound/tests)
WINE_CONFIG_DLL(dssenh)
WINE_CONFIG_DLL(dswave)
WINE_CONFIG_DLL(dwmapi)
WINE_CONFIG_DLL(dwmapi,,[dwmapi])
WINE_CONFIG_DLL(dxdiagn)
WINE_CONFIG_TEST(dlls/dxdiagn/tests)
WINE_CONFIG_LIB(dxerr8)
WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_DLL(dxgi,,[dxgi])
WINE_CONFIG_TEST(dlls/dxgi/tests)
WINE_CONFIG_LIB(dxguid)
WINE_CONFIG_DLL(faultrep)
......@@ -2255,17 +2258,17 @@ WINE_CONFIG_DLL(fusion)
WINE_CONFIG_TEST(dlls/fusion/tests)
WINE_CONFIG_DLL(fwpuclnt)
WINE_CONFIG_DLL(gdi.exe16,enable_win16)
WINE_CONFIG_DLL(gdi32)
WINE_CONFIG_DLL(gdi32,,[gdi32])
WINE_CONFIG_TEST(dlls/gdi32/tests)
WINE_CONFIG_DLL(gdiplus)
WINE_CONFIG_DLL(gdiplus,,[gdiplus])
WINE_CONFIG_TEST(dlls/gdiplus/tests)
WINE_CONFIG_DLL(glu32)
WINE_CONFIG_DLL(glu32,,[glu32])
WINE_CONFIG_DLL(gphoto2.ds)
WINE_CONFIG_DLL(gpkcsp)
WINE_CONFIG_DLL(hal)
WINE_CONFIG_DLL(hhctrl.ocx)
WINE_CONFIG_DLL(hid)
WINE_CONFIG_DLL(hlink)
WINE_CONFIG_DLL(hid,,[hid])
WINE_CONFIG_DLL(hlink,,[hlink])
WINE_CONFIG_TEST(dlls/hlink/tests)
WINE_CONFIG_DLL(hnetcfg)
WINE_CONFIG_DLL(httpapi)
......@@ -2273,12 +2276,12 @@ WINE_CONFIG_DLL(iccvid)
WINE_CONFIG_DLL(icmp)
WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16)
WINE_CONFIG_DLL(imaadp32.acm)
WINE_CONFIG_DLL(imagehlp)
WINE_CONFIG_DLL(imagehlp,,[imagehlp])
WINE_CONFIG_TEST(dlls/imagehlp/tests)
WINE_CONFIG_DLL(imm.dll16,enable_win16)
WINE_CONFIG_DLL(imm32)
WINE_CONFIG_DLL(imm32,,[imm32])
WINE_CONFIG_TEST(dlls/imm32/tests)
WINE_CONFIG_DLL(inetcomm)
WINE_CONFIG_DLL(inetcomm,,[inetcomm])
WINE_CONFIG_TEST(dlls/inetcomm/tests)
WINE_CONFIG_DLL(inetmib1)
WINE_CONFIG_TEST(dlls/inetmib1/tests)
......@@ -2287,26 +2290,26 @@ WINE_CONFIG_TEST(dlls/infosoft/tests)
WINE_CONFIG_DLL(initpki)
WINE_CONFIG_DLL(inkobj)
WINE_CONFIG_DLL(inseng)
WINE_CONFIG_DLL(iphlpapi)
WINE_CONFIG_DLL(iphlpapi,,[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)
WINE_CONFIG_DLL(kernel32,,[kernel32])
WINE_CONFIG_TEST(dlls/kernel32/tests)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16)
WINE_CONFIG_DLL(loadperf)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[kernel])
WINE_CONFIG_DLL(loadperf,,[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)
WINE_CONFIG_DLL(lz32,,[lz32])
WINE_CONFIG_TEST(dlls/lz32/tests)
WINE_CONFIG_DLL(lzexpand.dll16,enable_win16)
WINE_CONFIG_DLL(mapi32)
WINE_CONFIG_DLL(mapi32,,[mapi32])
WINE_CONFIG_TEST(dlls/mapi32/tests)
WINE_CONFIG_DLL(mapistub)
WINE_CONFIG_DLL(mciavi32)
......@@ -2315,7 +2318,7 @@ WINE_CONFIG_DLL(mciqtz32)
WINE_CONFIG_DLL(mciseq)
WINE_CONFIG_DLL(mciwave)
WINE_CONFIG_DLL(midimap)
WINE_CONFIG_DLL(mlang)
WINE_CONFIG_DLL(mlang,,[mlang])
WINE_CONFIG_TEST(dlls/mlang/tests)
WINE_CONFIG_DLL(mmdevapi)
WINE_CONFIG_TEST(dlls/mmdevapi/tests)
......@@ -2324,30 +2327,30 @@ 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)
WINE_CONFIG_DLL(mprapi)
WINE_CONFIG_DLL(mpr,,[mpr])
WINE_CONFIG_DLL(mprapi,,[mprapi])
WINE_CONFIG_DLL(msacm.dll16,enable_win16)
WINE_CONFIG_DLL(msacm32.drv)
WINE_CONFIG_DLL(msacm32)
WINE_CONFIG_DLL(msacm32,,[msacm32])
WINE_CONFIG_TEST(dlls/msacm32/tests)
WINE_CONFIG_DLL(msadp32.acm)
WINE_CONFIG_DLL(mscat32)
WINE_CONFIG_DLL(mscms)
WINE_CONFIG_DLL(mscms,,[mscms])
WINE_CONFIG_TEST(dlls/mscms/tests)
WINE_CONFIG_DLL(mscoree)
WINE_CONFIG_DLL(msctf)
WINE_CONFIG_TEST(dlls/msctf/tests)
WINE_CONFIG_DLL(msdaps)
WINE_CONFIG_DLL(msdmo)
WINE_CONFIG_DLL(msdmo,,[msdmo])
WINE_CONFIG_DLL(msftedit)
WINE_CONFIG_DLL(msg711.acm)
WINE_CONFIG_DLL(msgsm32.acm)
WINE_CONFIG_DLL(mshtml.tlb)
WINE_CONFIG_DLL(mshtml)
WINE_CONFIG_DLL(mshtml,,[mshtml])
WINE_CONFIG_TEST(dlls/mshtml/tests)
WINE_CONFIG_DLL(msi)
WINE_CONFIG_DLL(msi,,[msi])
WINE_CONFIG_TEST(dlls/msi/tests)
WINE_CONFIG_DLL(msimg32)
WINE_CONFIG_DLL(msimg32,,[msimg32])
WINE_CONFIG_DLL(msimtf)
WINE_CONFIG_DLL(msisip)
WINE_CONFIG_DLL(msisys.ocx)
......@@ -2358,34 +2361,34 @@ WINE_CONFIG_DLL(mssip32)
WINE_CONFIG_DLL(mstask)
WINE_CONFIG_TEST(dlls/mstask/tests)
WINE_CONFIG_DLL(msvcirt)
WINE_CONFIG_DLL(msvcr71)
WINE_CONFIG_DLL(msvcrt)
WINE_CONFIG_DLL(msvcr71,,[msvcr71])
WINE_CONFIG_DLL(msvcrt,,[msvcrt])
WINE_CONFIG_TEST(dlls/msvcrt/tests)
WINE_CONFIG_DLL(msvcrt20)
WINE_CONFIG_DLL(msvcrt40)
WINE_CONFIG_DLL(msvcrtd)
WINE_CONFIG_DLL(msvcrt20,,[msvcrt20])
WINE_CONFIG_DLL(msvcrt40,,[msvcrt40])
WINE_CONFIG_DLL(msvcrtd,,[msvcrtd])
WINE_CONFIG_TEST(dlls/msvcrtd/tests)
WINE_CONFIG_DLL(msvfw32)
WINE_CONFIG_DLL(msvfw32,,[msvfw32])
WINE_CONFIG_TEST(dlls/msvfw32/tests)
WINE_CONFIG_DLL(msvidc32)
WINE_CONFIG_DLL(msvideo.dll16,enable_win16)
WINE_CONFIG_DLL(mswsock)
WINE_CONFIG_DLL(mswsock,,[mswsock])
WINE_CONFIG_DLL(msxml3)
WINE_CONFIG_TEST(dlls/msxml3/tests)
WINE_CONFIG_DLL(nddeapi)
WINE_CONFIG_DLL(netapi32)
WINE_CONFIG_DLL(nddeapi,,[nddeapi])
WINE_CONFIG_DLL(netapi32,,[netapi32])
WINE_CONFIG_TEST(dlls/netapi32/tests)
WINE_CONFIG_DLL(newdev)
WINE_CONFIG_DLL(ntdll)
WINE_CONFIG_DLL(newdev,,[newdev])
WINE_CONFIG_DLL(ntdll,,[ntdll])
WINE_CONFIG_TEST(dlls/ntdll/tests)
WINE_CONFIG_DLL(ntdsapi)
WINE_CONFIG_DLL(ntdsapi,,[ntdsapi])
WINE_CONFIG_TEST(dlls/ntdsapi/tests)
WINE_CONFIG_DLL(ntoskrnl.exe)
WINE_CONFIG_DLL(ntoskrnl.exe,,[ntoskrnl.exe])
WINE_CONFIG_DLL(ntprint)
WINE_CONFIG_TEST(dlls/ntprint/tests)
WINE_CONFIG_DLL(objsel)
WINE_CONFIG_DLL(odbc32)
WINE_CONFIG_DLL(odbccp32)
WINE_CONFIG_DLL(odbc32,,[odbc32])
WINE_CONFIG_DLL(odbccp32,,[odbccp32])
WINE_CONFIG_TEST(dlls/odbccp32/tests)
WINE_CONFIG_DLL(ole2.dll16,enable_win16)
WINE_CONFIG_DLL(ole2conv.dll16,enable_win16)
......@@ -2393,31 +2396,31 @@ 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)
WINE_CONFIG_DLL(ole32,,[ole32])
WINE_CONFIG_TEST(dlls/ole32/tests)
WINE_CONFIG_DLL(oleacc)
WINE_CONFIG_DLL(oleacc,,[oleacc])
WINE_CONFIG_TEST(dlls/oleacc/tests)
WINE_CONFIG_DLL(oleaut32)
WINE_CONFIG_DLL(oleaut32,,[oleaut32])
WINE_CONFIG_TEST(dlls/oleaut32/tests)
WINE_CONFIG_DLL(olecli.dll16,enable_win16)
WINE_CONFIG_DLL(olecli32)
WINE_CONFIG_DLL(olecli32,,[olecli32])
WINE_CONFIG_DLL(oledb32)
WINE_CONFIG_TEST(dlls/oledb32/tests)
WINE_CONFIG_DLL(oledlg)
WINE_CONFIG_DLL(olepro32)
WINE_CONFIG_DLL(oledlg,,[oledlg])
WINE_CONFIG_DLL(olepro32,,[olepro32])
WINE_CONFIG_DLL(olesvr.dll16,enable_win16)
WINE_CONFIG_DLL(olesvr32)
WINE_CONFIG_DLL(olesvr32,,[olesvr32])
WINE_CONFIG_DLL(olethk32)
WINE_CONFIG_DLL(openal32)
WINE_CONFIG_DLL(opengl32)
WINE_CONFIG_DLL(opengl32,,[opengl32])
WINE_CONFIG_TEST(dlls/opengl32/tests)
WINE_CONFIG_DLL(pdh)
WINE_CONFIG_DLL(pdh,,[pdh])
WINE_CONFIG_TEST(dlls/pdh/tests)
WINE_CONFIG_DLL(pidgen)
WINE_CONFIG_DLL(powrprof)
WINE_CONFIG_DLL(powrprof,,[powrprof])
WINE_CONFIG_DLL(printui)
WINE_CONFIG_DLL(propsys)
WINE_CONFIG_DLL(psapi)
WINE_CONFIG_DLL(psapi,,[psapi])
WINE_CONFIG_TEST(dlls/psapi/tests)
WINE_CONFIG_DLL(pstorec)
WINE_CONFIG_DLL(qcap)
......@@ -2426,59 +2429,59 @@ WINE_CONFIG_TEST(dlls/qedit/tests)
WINE_CONFIG_DLL(qmgr)
WINE_CONFIG_TEST(dlls/qmgr/tests)
WINE_CONFIG_DLL(qmgrprxy)
WINE_CONFIG_DLL(quartz)
WINE_CONFIG_DLL(quartz,,[quartz])
WINE_CONFIG_TEST(dlls/quartz/tests)
WINE_CONFIG_DLL(query)
WINE_CONFIG_DLL(rasapi16.dll16,enable_win16)
WINE_CONFIG_DLL(rasapi32)
WINE_CONFIG_DLL(rasapi32,,[rasapi32])
WINE_CONFIG_TEST(dlls/rasapi32/tests)
WINE_CONFIG_DLL(rasdlg)
WINE_CONFIG_DLL(resutils)
WINE_CONFIG_DLL(riched20)
WINE_CONFIG_DLL(rasdlg,,[rasdlg])
WINE_CONFIG_DLL(resutils,,[resutils])
WINE_CONFIG_DLL(riched20,,[riched20])
WINE_CONFIG_TEST(dlls/riched20/tests)
WINE_CONFIG_DLL(riched32)
WINE_CONFIG_TEST(dlls/riched32/tests)
WINE_CONFIG_DLL(rpcrt4)
WINE_CONFIG_DLL(rpcrt4,,[rpcrt4])
WINE_CONFIG_TEST(dlls/rpcrt4/tests)
WINE_CONFIG_DLL(rsabase)
WINE_CONFIG_DLL(rsaenh)
WINE_CONFIG_DLL(rsaenh,,[rsaenh])
WINE_CONFIG_TEST(dlls/rsaenh/tests)
WINE_CONFIG_DLL(rtutils)
WINE_CONFIG_DLL(rtutils,,[rtutils])
WINE_CONFIG_DLL(sane.ds)
WINE_CONFIG_DLL(sccbase)
WINE_CONFIG_DLL(schannel)
WINE_CONFIG_TEST(dlls/schannel/tests)
WINE_CONFIG_DLL(secur32)
WINE_CONFIG_DLL(secur32,,[secur32])
WINE_CONFIG_TEST(dlls/secur32/tests)
WINE_CONFIG_DLL(security)
WINE_CONFIG_DLL(sensapi)
WINE_CONFIG_DLL(serialui)
WINE_CONFIG_DLL(sensapi,,[sensapi])
WINE_CONFIG_DLL(serialui,,[serialui])
WINE_CONFIG_TEST(dlls/serialui/tests)
WINE_CONFIG_DLL(setupapi)
WINE_CONFIG_DLL(setupapi,,[setupapi])
WINE_CONFIG_TEST(dlls/setupapi/tests)
WINE_CONFIG_DLL(setupx.dll16,enable_win16)
WINE_CONFIG_DLL(sfc)
WINE_CONFIG_DLL(sfc_os)
WINE_CONFIG_DLL(sfc,,[sfc])
WINE_CONFIG_DLL(sfc_os,,[sfc_os])
WINE_CONFIG_DLL(shdoclc)
WINE_CONFIG_DLL(shdocvw)
WINE_CONFIG_DLL(shdocvw,,[shdocvw])
WINE_CONFIG_TEST(dlls/shdocvw/tests)
WINE_CONFIG_DLL(shell.dll16,enable_win16)
WINE_CONFIG_DLL(shell32)
WINE_CONFIG_DLL(shell32,,[shell32])
WINE_CONFIG_TEST(dlls/shell32/tests)
WINE_CONFIG_DLL(shfolder)
WINE_CONFIG_DLL(shlwapi)
WINE_CONFIG_DLL(shfolder,,[shfolder])
WINE_CONFIG_DLL(shlwapi,,[shlwapi])
WINE_CONFIG_TEST(dlls/shlwapi/tests)
WINE_CONFIG_DLL(slbcsp)
WINE_CONFIG_DLL(slc)
WINE_CONFIG_DLL(snmpapi)
WINE_CONFIG_DLL(slc,,[slc])
WINE_CONFIG_DLL(snmpapi,,[snmpapi])
WINE_CONFIG_TEST(dlls/snmpapi/tests)
WINE_CONFIG_DLL(softpub)
WINE_CONFIG_DLL(sound.drv16,enable_win16)
WINE_CONFIG_DLL(spoolss)
WINE_CONFIG_DLL(spoolss,,[spoolss])
WINE_CONFIG_TEST(dlls/spoolss/tests)
WINE_CONFIG_DLL(stdole2.tlb)
WINE_CONFIG_DLL(stdole32.tlb)
WINE_CONFIG_DLL(sti)
WINE_CONFIG_DLL(sti,,[sti])
WINE_CONFIG_TEST(dlls/sti/tests)
WINE_CONFIG_DLL(storage.dll16,enable_win16)
WINE_CONFIG_DLL(stress.dll16,enable_win16)
......@@ -2487,32 +2490,32 @@ WINE_CONFIG_DLL(svrapi)
WINE_CONFIG_DLL(sxs)
WINE_CONFIG_DLL(system.drv16,enable_win16)
WINE_CONFIG_DLL(t2embed)
WINE_CONFIG_DLL(tapi32)
WINE_CONFIG_DLL(tapi32,,[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)
WINE_CONFIG_DLL(unicows,,[unicows])
WINE_CONFIG_DLL(updspapi)
WINE_CONFIG_DLL(url)
WINE_CONFIG_DLL(urlmon)
WINE_CONFIG_DLL(url,,[url])
WINE_CONFIG_DLL(urlmon,,[urlmon])
WINE_CONFIG_TEST(dlls/urlmon/tests)
WINE_CONFIG_DLL(user.exe16,enable_win16)
WINE_CONFIG_DLL(user32)
WINE_CONFIG_DLL(user32,,[user32])
WINE_CONFIG_TEST(dlls/user32/tests)
WINE_CONFIG_DLL(userenv)
WINE_CONFIG_DLL(userenv,,[userenv])
WINE_CONFIG_TEST(dlls/userenv/tests)
WINE_CONFIG_DLL(usp10)
WINE_CONFIG_DLL(usp10,,[usp10])
WINE_CONFIG_TEST(dlls/usp10/tests)
WINE_CONFIG_LIB(uuid)
WINE_CONFIG_DLL(uxtheme)
WINE_CONFIG_DLL(uxtheme,,[uxtheme])
WINE_CONFIG_TEST(dlls/uxtheme/tests)
WINE_CONFIG_DLL(vdhcp.vxd,enable_win16)
WINE_CONFIG_DLL(vdmdbg)
WINE_CONFIG_DLL(vdmdbg,,[vdmdbg])
WINE_CONFIG_DLL(ver.dll16,enable_win16)
WINE_CONFIG_DLL(version)
WINE_CONFIG_DLL(version,,[version])
WINE_CONFIG_TEST(dlls/version/tests)
WINE_CONFIG_DLL(vmm.vxd,enable_win16)
WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
......@@ -2527,13 +2530,13 @@ 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)
WINE_CONFIG_DLL(windowscodecs,,[windowscodecs])
WINE_CONFIG_TEST(dlls/windowscodecs/tests)
WINE_CONFIG_DLL(winealsa.drv)
WINE_CONFIG_DLL(wineaudioio.drv)
WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0)
WINE_CONFIG_DLL(wined3d)
WINE_CONFIG_DLL(wined3d,,[wined3d])
WINE_CONFIG_DLL(wineesd.drv)
WINE_CONFIG_DLL(winejack.drv)
WINE_CONFIG_DLL(winejoystick.drv)
......@@ -2547,38 +2550,38 @@ WINE_CONFIG_DLL(winequartz.drv)
WINE_CONFIG_DLL(winex11.drv)
WINE_CONFIG_DLL(wing.dll16,enable_win16)
WINE_CONFIG_DLL(wing32)
WINE_CONFIG_DLL(winhttp)
WINE_CONFIG_DLL(winhttp,,[winhttp])
WINE_CONFIG_TEST(dlls/winhttp/tests)
WINE_CONFIG_DLL(wininet)
WINE_CONFIG_DLL(wininet,,[wininet])
WINE_CONFIG_TEST(dlls/wininet/tests)
WINE_CONFIG_DLL(winmm)
WINE_CONFIG_DLL(winmm,,[winmm])
WINE_CONFIG_TEST(dlls/winmm/tests)
WINE_CONFIG_DLL(winnls.dll16,enable_win16)
WINE_CONFIG_DLL(winnls32)
WINE_CONFIG_DLL(winscard)
WINE_CONFIG_DLL(winnls32,,[winnls32])
WINE_CONFIG_DLL(winscard,,[winscard])
WINE_CONFIG_DLL(winsock.dll16,enable_win16)
WINE_CONFIG_DLL(winspool.drv)
WINE_CONFIG_DLL(winspool.drv,,[winspool])
WINE_CONFIG_TEST(dlls/winspool.drv/tests)
WINE_CONFIG_DLL(wintab.dll16,enable_win16)
WINE_CONFIG_DLL(wintab32)
WINE_CONFIG_DLL(wintab32,,[wintab32])
WINE_CONFIG_TEST(dlls/wintab32/tests)
WINE_CONFIG_DLL(wintrust)
WINE_CONFIG_DLL(wintrust,,[wintrust])
WINE_CONFIG_TEST(dlls/wintrust/tests)
WINE_CONFIG_DLL(wldap32)
WINE_CONFIG_DLL(wldap32,,[wldap32])
WINE_CONFIG_TEST(dlls/wldap32/tests)
WINE_CONFIG_DLL(wmi)
WINE_CONFIG_DLL(wmiutils)
WINE_CONFIG_DLL(wnaspi32)
WINE_CONFIG_DLL(wow32,enable_win16)
WINE_CONFIG_DLL(ws2_32)
WINE_CONFIG_DLL(wnaspi32,,[wnaspi32])
WINE_CONFIG_DLL(wow32,enable_win16,[wow32])
WINE_CONFIG_DLL(ws2_32,,[ws2_32])
WINE_CONFIG_TEST(dlls/ws2_32/tests)
WINE_CONFIG_DLL(wsock32)
WINE_CONFIG_DLL(wtsapi32)
WINE_CONFIG_DLL(wsock32,,[wsock32])
WINE_CONFIG_DLL(wtsapi32,,[wtsapi32])
WINE_CONFIG_DLL(wuapi)
WINE_CONFIG_DLL(wuaueng)
WINE_CONFIG_DLL(xinput1_1)
WINE_CONFIG_DLL(xinput1_2)
WINE_CONFIG_DLL(xinput1_3)
WINE_CONFIG_DLL(xinput1_3,,[xinput])
WINE_CONFIG_TEST(dlls/xinput1_3/tests)
WINE_CONFIG_DLL(xinput9_1_0)
WINE_CONFIG_DLL(xmllite)
......
This diff is collapsed.
......@@ -360,7 +360,12 @@ sub update_makefiles(@)
if ($rules eq $makerules{"MAKE_DLL_RULES"})
{
(my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
$args .= ",enable_win16" if $is_win16;
my $implib = $make{"IMPORTLIB"} || "";
my $implib_srcs = defined($make{"IMPLIB_SRCS"}) && join( " ", @{$make{"IMPLIB_SRCS"}} );
$args .= "," if $implib || $is_win16;
$args .= "enable_win16" if $is_win16;
$args .= ",[$implib]" if $implib;
$args .= ",[$implib_srcs]" if $implib_srcs;
push @lines, "WINE_CONFIG_DLL($name$args)\n";
}
elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
......@@ -434,154 +439,18 @@ sub update_ignores(@)
{
push @ignores, $makefile{"=dir"} . $f unless $f =~ /\$\(.*\)/; # skip make variables
}
}
return @ignores;
}
################################################################
# update dlls/Makefile.in
sub update_dlls(@)
{
my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
my $text = "";
my @ignores = ();
foreach my $make (@_)
{
my %makefile = %{$makefiles{$make}};
next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"});
next unless defined $makefile{"MODULE"};
my $module = $makefile{"MODULE"};
(my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/;
if ($makefile{"=rules"} eq $makerules{"MAKE_IMPLIB_RULES"})
{
$staticlib_dirs{$module} = $dir;
die "invalid module $module in dir $staticlib_dirs{$module}\n" if "$staticlib_dirs{$module}" ne $module;
}
else
{
die "invalid module $module" unless $module =~ /\./;
(my $mod = $module) =~ s/\.dll$//;
die "invalid directory $dir for module $module\n" unless $mod eq $dir;
$directories{$module} = $dir;
}
if (defined $makefile{"IMPORTLIB"})
{
if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)/)
{
$importlibs{$module} = $1;
if ("dlls/$1/" ne $makefile{"=dir"}) { push @ignores, "dlls/lib$1.def"; }
}
else
{
die "invalid importlib name $makefile{IMPORTLIB} in $make";
die "invalid importlib name $makefile{IMPORTLIB} in $file";
}
}
$static_implibs{$module} = 1 if defined $makefile{"IMPLIB_SRCS"};
}
$text .= "\@MAKE_RULES\@\n\n";
# output the all: target
$text .= "# Main target\n\n";
$text .= "all: \$(BUILDSUBDIRS)\n\n";
# output the import libraries rules
$text .= "# Import libraries\n\n";
$text .= "STATIC_IMPLIBEXT = \$(IMPLIBEXT:def=def.a)\n\n";
my @lib_symlinks = ();
foreach my $mod (sort keys %importlibs)
{
my $dir = $directories{$mod};
my $lib = $importlibs{$mod};
if ($lib ne $dir) { push @lib_symlinks, $mod; }
}
$text .= "IMPORT_SYMLINKS =";
foreach my $mod (sort @lib_symlinks)
{
$text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod};
}
$text .= "\n\nSTATIC_LIBS = \@ALL_STATIC_LIBS\@\n";
$text .= "IMPORT_LIBS = \$(STATIC_LIBS) \\\n\t\$(IMPORT_SYMLINKS)";
foreach my $mod (sort keys %importlibs)
{
$text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)";
next unless defined $static_implibs{$mod};
$text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
}
$text .= "\n\nCROSS_IMPLIBS = \$(STATIC_LIBS:.a=.cross.a)";
foreach my $mod (sort @lib_symlinks)
{
next if $mod =~ /16$/;
$text .= sprintf " \\\n\tlib%s.cross.a", $importlibs{$mod};
}
foreach my $mod (sort keys %importlibs)
{
next if $mod =~ /16$/;
next if defined $static_implibs{$mod};
$text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.cross.a";
}
$text .= "\n\n";
$text .= "\$(TESTSUBDIRS:%=%/__crosstest__): \$(CROSS_IMPLIBS)\n\n";
$text .= "implib: \$(IMPORT_LIBS)\n\n";
$text .= "testsubdirs: \$(TESTSUBDIRS)\n\n";
$text .= ".PHONY: implib testsubdirs\n\n";
foreach my $mod (sort keys %importlibs)
{
my $dir = $directories{$mod};
my $lib = $importlibs{$mod};
my $spec = $mod;
$spec =~ s/\.dll$//;
if (defined($static_implibs{$mod}))
{
$text .= sprintf "%s/lib%s.def: %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
$text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.def\n\n", $dir, $lib;
$text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT) %s/lib%s.cross.a: dummy\n", $dir, $lib, $dir, $lib, $dir, $spec;
$text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
}
else
{
$text .= sprintf "%s/lib%s.def %s/lib%s.a %s/lib%s.cross.a: %s/%s.spec \$(WINEBUILD)\n",
$dir, $lib, $dir, $lib, $dir, $lib, $dir, $spec;
$text .= sprintf "\t\@cd %s && \$(MAKE) `basename \$\@`\n\n", $dir;
}
}
foreach my $mod (sort @lib_symlinks)
{
my $dir = $directories{$mod};
my $lib = "lib" . $importlibs{$mod};
$text .= sprintf "%s.a: %s/%s.a\n", $lib, $dir, $lib;
$text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.a \$@\n\n", $dir, $lib;
$text .= sprintf "%s.cross.a: %s/%s.cross.a\n", $lib, $dir, $lib;
$text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.cross.a \$@\n\n", $dir, $lib;
$text .= sprintf "%s.def: %s/%s.def\n", $lib, $dir, $lib;
$text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.def \$@\n\n", $dir, $lib;
}
$text .= "\$(BUILDSUBDIRS): \$(IMPORT_LIBS)\n";
$text .= "\$(INSTALLSUBDIRS:%=%/__install__) \$(INSTALLSUBDIRS:%=%/__install-lib__): \$(IMPORT_LIBS)\n\n";
$text .= "\@ALL_IMPORTLIB_RULES\@\n";
$text .= "\n# Misc rules\n";
replace_in_file( "dlls/Makefile.in",
'^\@MAKE_RULES\@',
'^# Misc rules',
$text );
# .gitignore file
foreach my $mod (sort @lib_symlinks)
{
push @ignores, "dlls/lib$importlibs{$mod}.def";
}
return @ignores;
}
......@@ -676,5 +545,4 @@ assign_sources_to_makefiles();
update_makefiles( @makefiles );
push @ignores, update_includes();
push @ignores, update_ignores( @makefiles );
push @ignores, update_dlls( sort grep /^dlls\//, @makefiles );
update_gitignore( @ignores );
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment