ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Use a single variable for all types of idl files.

This commit is contained in:
Alexandre Julliard 2013-12-31 18:15:17 +01:00
parent 33132ce762
commit d08ff3ff19
100 changed files with 134 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Make.rules.in
View File

@ -16,11 +16,8 @@ ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFL
IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS)
RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS)
IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \
$(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c)
OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \
$(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS:.m=.o) \
$(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS)

16
dlls/actxprxy/Makefile.in
View File

@ -7,21 +7,7 @@ EXTRA_OBJS = dlldata.o
C_SRCS = \
usrmarshal.c
IDL_P_SRCS = \
actxprxy_activscp.idl \
actxprxy_comcat.idl \
actxprxy_docobj.idl \
actxprxy_hlink.idl \
actxprxy_htiface.idl \
actxprxy_htiframe.idl \
actxprxy_objsafe.idl \
actxprxy_ocmm.idl \
actxprxy_servprov.idl \
actxprxy_shldisp.idl \
actxprxy_shobjidl.idl \
actxprxy_urlhist.idl
IDL_R_SRCS = \
IDL_SRCS = \
actxprxy_activscp.idl \
actxprxy_comcat.idl \
actxprxy_docobj.idl \

2
dlls/advapi32/Makefile.in
View File

@ -20,7 +20,7 @@ C_SRCS = \
security.c \
service.c
IDL_C_SRCS = svcctl.idl
IDL_SRCS = svcctl.idl
RC_SRCS = version.rc

2
dlls/amstream/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
mediastream.c \
mediastreamfilter.c
IDL_R_SRCS = amstream_classes.idl
IDL_SRCS = amstream_classes.idl
RC_SRCS = version.rc

2
dlls/atl/Makefile.in
View File

@ -5,6 +5,6 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_30
C_SRCS = atl_main.c
IDL_R_SRCS = atl_classes.idl
IDL_SRCS = atl_classes.idl
@MAKE_DLL_RULES@

2
dlls/avifil32/Makefile.in
View File

@ -14,7 +14,7 @@ C_SRCS = \
tmpfile.c \
wavfile.c
IDL_R_SRCS = avifil32.idl
IDL_SRCS = avifil32.idl
RC_SRCS = avifil32.rc

2
dlls/browseui/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
compcatcachedaemon.c \
progressdlg.c
IDL_R_SRCS = browseui_classes.idl
IDL_SRCS = browseui_classes.idl
RC_SRCS = browseui.rc

2
dlls/comdlg32/Makefile.in
View File

@ -22,6 +22,6 @@ SVG_SRCS = \
pd32_nocollate.svg \
pd32_portrait.svg
IDL_R_SRCS = comdlg32_classes.idl
IDL_SRCS = comdlg32_classes.idl
@MAKE_DLL_RULES@

2
dlls/d3dxof/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
mszip.c \
parsing.c
IDL_R_SRCS = d3dxof.idl
IDL_SRCS = d3dxof.idl
RC_SRCS = version.rc

2
dlls/ddraw/Makefile.in
View File

@ -16,7 +16,7 @@ C_SRCS = \
vertexbuffer.c \
viewport.c
IDL_R_SRCS = ddraw_classes.idl
IDL_SRCS = ddraw_classes.idl
RC_SRCS = version.rc

2
dlls/ddrawex/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
main.c \
surface.c
IDL_R_SRCS = ddrawex.idl
IDL_SRCS = ddrawex.idl
@MAKE_DLL_RULES@

2
dlls/devenum/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
mediacatenum.c \
parsedisplayname.c
IDL_R_SRCS = devenum_classes.idl
IDL_SRCS = devenum_classes.idl
RC_SRCS = devenum.rc

2
dlls/dinput/Makefile.in
View File

@ -18,7 +18,7 @@ C_SRCS = \
IMPLIB_SRCS = data_formats.c
IDL_R_SRCS = dinput_classes.idl
IDL_SRCS = dinput_classes.idl
RC_SRCS = dinput.rc

2
dlls/dinput8/Makefile.in
View File

@ -5,7 +5,7 @@ IMPORTS = uuid dxguid dinput ole32 advapi32
C_SRCS = \
dinput8_main.c
IDL_R_SRCS = dinput8.idl
IDL_SRCS = dinput8.idl
RC_SRCS = version.rc

5
dlls/dispex/Makefile.in
View File

@ -7,10 +7,7 @@ EXTRA_OBJS = dlldata.o
C_SRCS = \
usrmarshal.c
IDL_P_SRCS = \
disp_ex.idl
IDL_R_SRCS = \
IDL_SRCS = \
disp_ex.idl
@MAKE_DLL_RULES@

2
dlls/dmband/Makefile.in
View File

@ -7,7 +7,7 @@ C_SRCS = \
dmband_main.c \
dmutils.c
IDL_R_SRCS = dmband.idl
IDL_SRCS = dmband.idl
RC_SRCS = version.rc

2
dlls/dmcompos/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
dmcompos_main.c \
signposttrack.c
IDL_R_SRCS = dmcompos.idl
IDL_SRCS = dmcompos.idl
RC_SRCS = version.rc

2
dlls/dmime/Makefile.in
View File

@ -19,7 +19,7 @@ C_SRCS = \
timesigtrack.c \
wavetrack.c
IDL_R_SRCS = dmime.idl
IDL_SRCS = dmime.idl
RC_SRCS = version.rc

2
dlls/dmloader/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
loader.c \
loaderstream.c
IDL_R_SRCS = dmloader.idl
IDL_SRCS = dmloader.idl
RC_SRCS = version.rc

2
dlls/dmscript/Makefile.in
View File

@ -6,7 +6,7 @@ C_SRCS = \
script.c \
scripttrack.c
IDL_R_SRCS = dmscript.idl
IDL_SRCS = dmscript.idl
RC_SRCS = rsrc.rc

2
dlls/dmstyle/Makefile.in
View File

@ -12,7 +12,7 @@ C_SRCS = \
style.c \
styletrack.c
IDL_R_SRCS = dmstyle.idl
IDL_SRCS = dmstyle.idl
RC_SRCS = version.rc

2
dlls/dmsynth/Makefile.in
View File

@ -6,7 +6,7 @@ C_SRCS = \
synth.c \
synthsink.c
IDL_R_SRCS = dmsynth.idl
IDL_SRCS = dmsynth.idl
RC_SRCS = version.rc

2
dlls/dmusic/Makefile.in
View File

@ -11,7 +11,7 @@ C_SRCS = \
instrument.c \
port.c
IDL_R_SRCS = dmusic.idl
IDL_SRCS = dmusic.idl
RC_SRCS = version.rc

2
dlls/dplayx/Makefile.in
View File

@ -13,7 +13,7 @@ C_SRCS = \
lobbysp.c \
name_server.c
IDL_R_SRCS = dplayx.idl
IDL_SRCS = dplayx.idl
RC_SRCS = version.rc

2
dlls/dpnet/Makefile.in
View File

@ -11,7 +11,7 @@ C_SRCS = \
server.c \
threadpool.c
IDL_R_SRCS = dpnet.idl
IDL_SRCS = dpnet.idl
RC_SRCS = version.rc

2
dlls/dsound/Makefile.in
View File

@ -14,7 +14,7 @@ C_SRCS = \
propset.c \
sound3d.c
IDL_R_SRCS = dsound_classes.idl
IDL_SRCS = dsound_classes.idl
RC_SRCS = version.rc

2
dlls/dswave/Makefile.in
View File

@ -5,7 +5,7 @@ C_SRCS = \
dswave.c \
dswave_main.c
IDL_R_SRCS = dswave.idl
IDL_SRCS = dswave.idl
RC_SRCS = version.rc

6
dlls/dxdiagn/Makefile.in
View File

@ -8,8 +8,8 @@ C_SRCS = \
RC_SRCS = dxdiagn.rc
IDL_H_SRCS = fil_data.idl
IDL_R_SRCS = dxdiagn.idl
IDL_SRCS = \
dxdiagn.idl \
fil_data.idl
@MAKE_DLL_RULES@

2
dlls/explorerframe/Makefile.in
View File

@ -6,7 +6,7 @@ C_SRCS = \
nstc.c \
taskbarlist.c
IDL_R_SRCS = explorerframe.idl
IDL_SRCS = explorerframe.idl
RC_SRCS = \
version.rc

2
dlls/gameux/Makefile.in
View File

@ -7,7 +7,7 @@ C_SRCS = \
gamestatistics.c \
main.c
IDL_TLB_SRCS = gameux_tlb.idl
IDL_SRCS = gameux_tlb.idl
RC_SRCS = rsrc.rc

2
dlls/hhctrl.ocx/Makefile.in
View File

@ -12,7 +12,7 @@ C_SRCS = \
stream.c \
webbrowser.c
IDL_TLB_SRCS = hhctrl_tlb.idl
IDL_SRCS = hhctrl_tlb.idl
RC_SRCS = hhctrl.rc

2
dlls/hlink/Makefile.in
View File

@ -9,6 +9,6 @@ C_SRCS = \
hlink_main.c \
link.c
IDL_R_SRCS = hlink_classes.idl
IDL_SRCS = hlink_classes.idl
@MAKE_DLL_RULES@

5
dlls/hnetcfg/Makefile.in
View File

@ -10,7 +10,8 @@ C_SRCS = \
profile.c \
service.c
IDL_R_SRCS = hnetcfg.idl
IDL_TLB_SRCS = hnetcfg_tlb.idl
IDL_SRCS = \
hnetcfg.idl \
hnetcfg_tlb.idl
@MAKE_DLL_RULES@

3
dlls/ieframe/Makefile.in
View File

@ -27,7 +27,6 @@ RC_SRCS = ieframe.rc
SVG_SRCS = \
ietoolbar.svg
IDL_TLB_SRCS = ieframe_v1.idl
IDL_R_SRCS = ieframe_v1.idl
IDL_SRCS = ieframe_v1.idl
@MAKE_DLL_RULES@

2
dlls/inetcomm/Makefile.in
View File

@ -11,6 +11,6 @@ C_SRCS = \
pop3transport.c \
smtptransport.c
IDL_R_SRCS = inetcomm.idl
IDL_SRCS = inetcomm.idl
@MAKE_DLL_RULES@

2
dlls/infosoft/Makefile.in
View File

@ -5,6 +5,6 @@ C_SRCS = \
infosoft_main.c \
wordbreaker.c
IDL_R_SRCS = infosoft.idl
IDL_SRCS = infosoft.idl
@MAKE_DLL_RULES@

2
dlls/inseng/Makefile.in
View File

@ -4,6 +4,6 @@ IMPORTS = uuid ole32 advapi32
C_SRCS = \
inseng_main.c
IDL_R_SRCS = inseng.idl
IDL_SRCS = inseng.idl
@MAKE_DLL_RULES@

2
dlls/itss/Makefile.in
View File

@ -9,7 +9,7 @@ C_SRCS = \
protocol.c \
storage.c
IDL_R_SRCS = itss.idl
IDL_SRCS = itss.idl
RC_SRCS = rsrc.rc

5
dlls/jscript/Makefile.in
View File

@ -28,8 +28,9 @@ C_SRCS = \
RC_SRCS = jscript.rc
IDL_TLB_SRCS = jsglobal.idl
IDL_R_SRCS = jscript_classes.idl
IDL_SRCS = \
jscript_classes.idl \
jsglobal.idl
BISON_SRCS = \
parser.y

2
dlls/mlang/Makefile.in
View File

@ -6,6 +6,6 @@ DELAYIMPORTS = oleaut32
C_SRCS = \
mlang.c
IDL_R_SRCS = mlang_classes.idl
IDL_SRCS = mlang_classes.idl
@MAKE_DLL_RULES@

2
dlls/mmcndmgr/Makefile.in
View File

@ -4,6 +4,6 @@ IMPORTS = uuid oleaut32 ole32 user32
C_SRCS = \
mmcndmgr.c
IDL_TLB_SRCS = mmcndmgr.idl
IDL_SRCS = mmcndmgr.idl
@MAKE_DLL_RULES@

2
dlls/mmdevapi/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
devenum.c \
main.c
IDL_R_SRCS = mmdevapi_classes.idl
IDL_SRCS = mmdevapi_classes.idl
@MAKE_DLL_RULES@

2
dlls/mscoree/Makefile.in
View File

@ -10,6 +10,6 @@ C_SRCS = \
metahost.c \
mscoree_main.c
IDL_R_SRCS = mscoree_classes.idl
IDL_SRCS = mscoree_classes.idl
@MAKE_DLL_RULES@

2
dlls/msctf/Makefile.in
View File

@ -13,7 +13,7 @@ C_SRCS = \
range.c \
threadmgr.c
IDL_R_SRCS = msctf_classes.idl
IDL_SRCS = msctf_classes.idl
RC_SRCS = \
version.rc

6
dlls/msdaps/Makefile.in
View File

@ -10,11 +10,7 @@ C_SRCS = \
row_server.c \
usrmarshal.c
IDL_P_SRCS = \
msdaps.idl \
row_server.idl
IDL_R_SRCS = \
IDL_SRCS = \
msdaps.idl \
row_server.idl

2
dlls/mshtml.tlb/Makefile.in
View File

@ -1,5 +1,5 @@
MODULE = mshtml.tlb
IDL_TLB_SRCS = mshtml_tlb.idl
IDL_SRCS = mshtml_tlb.idl
@MAKE_DLL_RULES@

6
dlls/mshtml/Makefile.in
View File

@ -81,8 +81,8 @@ C_SRCS = \
RC_SRCS = mshtml.rc
IDL_H_SRCS = nsiface.idl
IDL_R_SRCS = mshtml_classes.idl
IDL_SRCS = \
mshtml_classes.idl \
nsiface.idl
@MAKE_DLL_RULES@

2
dlls/mshtml/tests/Makefile.in
View File

@ -11,7 +11,7 @@ C_SRCS = \
script.c \
style.c
IDL_TLB_SRCS = test_tlb.idl
IDL_SRCS = test_tlb.idl
RC_SRCS = rsrc.rc

4
dlls/msi/Makefile.in
View File

@ -44,9 +44,7 @@ C_SRCS = \
upgrade.c \
where.c
IDL_I_SRCS = msiserver.idl
IDL_R_SRCS = msiserver.idl
IDL_TLB_SRCS = msiserver.idl
IDL_SRCS = msiserver.idl
BISON_SRCS = \
cond.y \

2
dlls/msident/Makefile.in
View File

@ -3,6 +3,6 @@ MODULE = msident.dll
C_SRCS = \
msident.c
IDL_R_SRCS = msident_classes.idl
IDL_SRCS = msident_classes.idl
@MAKE_DLL_RULES@

2
dlls/msimtf/Makefile.in
View File

@ -5,6 +5,6 @@ C_SRCS = \
activeimmapp.c \
main.c
IDL_R_SRCS = msimtf.idl
IDL_SRCS = msimtf.idl
@MAKE_DLL_RULES@

4
dlls/mstask/Makefile.in
View File

@ -8,7 +8,7 @@ C_SRCS = \
task_scheduler.c \
task_trigger.c
IDL_I_SRCS = mstask_local.idl
IDL_R_SRCS = mstask_local.idl
IDL_SRCS = \
mstask_local.idl
@MAKE_DLL_RULES@

2
dlls/msxml/Makefile.in
View File

@ -2,7 +2,7 @@ MODULE = msxml.dll
C_SRCS = main.c
IDL_TLB_SRCS = msxml_tlb.idl
IDL_SRCS = msxml_tlb.idl
RC_SRCS = rsrc.rc

2
dlls/msxml2/Makefile.in
View File

@ -2,6 +2,6 @@ MODULE = msxml2.dll
C_SRCS = main.c
IDL_TLB_SRCS = msxml2_tlb.idl
IDL_SRCS = msxml2_tlb.idl
@MAKE_DLL_RULES@

6
dlls/msxml3/Makefile.in
View File

@ -45,8 +45,8 @@ RC_SRCS = \
schemas.rc \
version.rc
IDL_R_SRCS = xmlparser.idl
IDL_TLB_SRCS = msxml3_v1.idl
IDL_SRCS = \
msxml3_v1.idl \
xmlparser.idl
@MAKE_DLL_RULES@

2
dlls/msxml3/tests/Makefile.in
View File

@ -10,7 +10,7 @@ C_SRCS = \
xmlparser.c \
xmlview.c
IDL_H_SRCS = xmlparser.idl
IDL_SRCS = xmlparser.idl
RC_SRCS = rsrc.rc

2
dlls/msxml4/Makefile.in
View File

@ -4,7 +4,7 @@ IMPORTS = ole32 advapi32
C_SRCS = \
main.c
IDL_TLB_SRCS = msxml4_tlb.idl
IDL_SRCS = msxml4_tlb.idl
RC_SRCS = rsrc.rc

2
dlls/msxml6/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
RC_SRCS = rsrc.rc
IDL_TLB_SRCS = msxml6_tlb.idl
IDL_SRCS = msxml6_tlb.idl
@MAKE_DLL_RULES@

2
dlls/objsel/Makefile.in
View File

@ -5,7 +5,7 @@ C_SRCS = \
factory.c \
objsel.c
IDL_R_SRCS = objsel_classes.idl
IDL_SRCS = objsel_classes.idl
RC_SRCS = objsel.rc

12
dlls/ole32/Makefile.in
View File

@ -43,17 +43,9 @@ C_SRCS = \
RC_SRCS = ole32res.rc
IDL_C_SRCS = \
irot.idl
IDL_P_SRCS = \
dcom.idl \
ole32_objidl.idl \
ole32_oleidl.idl \
ole32_unknwn.idl
IDL_R_SRCS = \
IDL_SRCS = \
dcom.idl \
irot.idl \
ole32_objidl.idl \
ole32_oleidl.idl \
ole32_unknwn.idl

2
dlls/oleacc/Makefile.in
View File

@ -5,7 +5,7 @@ IMPORTS = user32
C_SRCS = \
main.c
IDL_TLB_SRCS = oleacc_classes.idl
IDL_SRCS = oleacc_classes.idl
RC_SRCS = oleacc.rc

6
dlls/oleaut32/Makefile.in
View File

@ -23,11 +23,7 @@ C_SRCS = \
RC_SRCS = oleaut32.rc
IDL_P_SRCS = \
oleaut32_oaidl.idl \
oleaut32_ocidl.idl
IDL_R_SRCS = \
IDL_SRCS = \
oleaut32_oaidl.idl \
oleaut32_ocidl.idl

6
dlls/oleaut32/tests/Makefile.in
View File

@ -15,11 +15,7 @@ C_SRCS = \
RC_SRCS = tmarshal.rc
IDL_I_SRCS = \
test_reg.idl \
tmarshal.idl
IDL_TLB_SRCS = \
IDL_SRCS = \
test_reg.idl \
test_tlb.idl \
tmarshal.idl

9
dlls/oledb32/Makefile.in
View File

@ -9,10 +9,9 @@ C_SRCS = \
main.c \
rowpos.c
IDL_I_SRCS = convert.idl
IDL_R_SRCS = oledb32_classes.idl
IDL_TLB_SRCS = oledb32_typelib.idl
IDL_SRCS = \
convert.idl \
oledb32_classes.idl \
oledb32_typelib.idl
@MAKE_DLL_RULES@

2
dlls/oledb32/tests/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
database.c \
marshal.c
IDL_I_SRCS = convert.idl
IDL_SRCS = convert.idl
@MAKE_TEST_RULES@

2
dlls/propsys/Makefile.in
View File

@ -7,6 +7,6 @@ C_SRCS = \
propsys_main.c \
propvar.c
IDL_R_SRCS = propsys_classes.idl
IDL_SRCS = propsys_classes.idl
@MAKE_DLL_RULES@

2
dlls/pstorec/Makefile.in
View File

@ -4,6 +4,6 @@ IMPORTS = uuid
C_SRCS = \
pstorec.c
IDL_TLB_SRCS = pstorec_tlb.idl
IDL_SRCS = pstorec_tlb.idl
@MAKE_DLL_RULES@

2
dlls/qedit/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
mediadet.c \
samplegrabber.c
IDL_R_SRCS = qedit_classes.idl
IDL_SRCS = qedit_classes.idl
@MAKE_DLL_RULES@

2
dlls/qmgr/Makefile.in
View File

@ -13,6 +13,6 @@ C_SRCS = \
RC_SRCS = rsrc.rc
IDL_I_SRCS = qmgr_local.idl
IDL_SRCS = qmgr_local.idl
@MAKE_DLL_RULES@

4
dlls/qmgrprxy/Makefile.in
View File

@ -2,9 +2,7 @@ MODULE = qmgrprxy.dll
IMPORTS = rpcrt4
EXTRADEFS = -DWINE_REGISTER_DLL
IDL_I_SRCS = qmgrprxy.idl
IDL_P_SRCS = qmgrprxy.idl
IDL_R_SRCS = qmgrprxy.idl
IDL_SRCS = qmgrprxy.idl
EXTRA_OBJS = dlldata.o

8
dlls/quartz/Makefile.in
View File

@ -29,10 +29,10 @@ C_SRCS = \
RC_SRCS = version.rc
IDL_H_SRCS = fil_data.idl
IDL_P_SRCS = quartz_strmif.idl
IDL_R_SRCS = quartz_strmif.idl
IDL_TLB_SRCS = control_tlb.idl
IDL_SRCS = \
control_tlb.idl \
fil_data.idl \
quartz_strmif.idl
EXTRA_OBJS = dlldata.o

2
dlls/quartz/tests/Makefile.in
View File

@ -11,6 +11,6 @@ C_SRCS = \
referenceclock.c \
videorenderer.c
IDL_H_SRCS = fil_data.idl
IDL_SRCS = fil_data.idl
@MAKE_TEST_RULES@

3
dlls/rpcrt4/Makefile.in
View File

@ -27,7 +27,6 @@ C_SRCS = \
RC_SRCS = version.rc
IDL_C_SRCS = \
epm.idl
IDL_SRCS = epm.idl
@MAKE_DLL_RULES@

5
dlls/rpcrt4/tests/Makefile.in
View File

@ -2,9 +2,6 @@ TESTDLL = rpcrt4.dll
IMPORTS = ole32 rpcrt4 advapi32
EXTRAIDLFLAGS = --prefix-server=s_
IDL_C_SRCS = server.idl
IDL_S_SRCS = server.idl
C_SRCS = \
cstub.c \
generated.c \
@ -14,4 +11,6 @@ C_SRCS = \
rpc_protseq.c \
server.c
IDL_SRCS = server.idl
@MAKE_TEST_RULES@

2
dlls/scrrun/Makefile.in
View File

@ -8,6 +8,6 @@ C_SRCS = \
RC_SRCS = scrrun.rc
IDL_TLB_SRCS = scrrun.idl
IDL_SRCS = scrrun.idl
@MAKE_DLL_RULES@

2
dlls/scrrun/tests/Makefile.in
View File

@ -5,6 +5,6 @@ C_SRCS = \
dictionary.c \
filesystem.c
IDL_H_SRCS = scrrun.idl
IDL_SRCS = scrrun.idl
@MAKE_TEST_RULES@

2
dlls/shdocvw/Makefile.in
View File

@ -11,6 +11,6 @@ C_SRCS = \
RC_SRCS = \
shdocvw.rc
IDL_TLB_SRCS = shdocvw_v1.idl
IDL_SRCS = shdocvw_v1.idl
@MAKE_DLL_RULES@

6
dlls/shell32/Makefile.in
View File

@ -57,9 +57,9 @@ C_SRCS = \
RC_SRCS = shell32.rc
IDL_TLB_SRCS = shell32_tlb.idl
IDL_R_SRCS = shell32_classes.idl
IDL_SRCS = \
shell32_classes.idl \
shell32_tlb.idl
SVG_SRCS = \
cdrom.svg \

2
dlls/stdole2.tlb/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = stdole2.tlb
RC_SRCS = rsrc.rc
IDL_TLB_SRCS = std_ole_v2.idl
IDL_SRCS = std_ole_v2.idl
@MAKE_DLL_RULES@

2
dlls/stdole32.tlb/Makefile.in
View File

@ -1,6 +1,6 @@
MODULE = stdole32.tlb
RC_SRCS = rsrc.rc
IDL_TLB_SRCS = std_ole_v1.idl
IDL_SRCS = std_ole_v1.idl
@MAKE_DLL_RULES@

6
dlls/sti/Makefile.in
View File

@ -7,11 +7,7 @@ C_SRCS = \
sti.c \
sti_main.c
IDL_P_SRCS = \
sti_wia.idl
IDL_R_SRCS = \
sti_wia.idl
IDL_SRCS = sti_wia.idl
EXTRA_OBJS = dlldata.o

2
dlls/taskschd/Makefile.in
View File

@ -4,6 +4,6 @@ C_SRCS = \
task.c \
taskschd.c
IDL_TLB_SRCS = taskschd_tlb.idl
IDL_SRCS = taskschd_tlb.idl
@MAKE_DLL_RULES@

3
dlls/urlmon/Makefile.in
View File

@ -30,8 +30,7 @@ C_SRCS = \
RC_SRCS = urlmon.rc
IDL_P_SRCS = urlmon_urlmon.idl
IDL_R_SRCS = urlmon_urlmon.idl
IDL_SRCS = urlmon_urlmon.idl
EXTRA_OBJS = dlldata.o

5
dlls/vbscript/Makefile.in
View File

@ -18,11 +18,10 @@ BISON_SRCS = \
RC_SRCS = vbscript.rc
IDL_TLB_SRCS = \
IDL_SRCS = \
vbscript_classes.idl \
vbsglobal.idl \
vbsregexp10.idl \
vbsregexp55.idl
IDL_R_SRCS = vbscript_classes.idl
@MAKE_DLL_RULES@

4
dlls/vbscript/tests/Makefile.in
View File

@ -6,8 +6,8 @@ C_SRCS = \
run.c \
vbscript.c
IDL_H_SRCS = vbsregexp55.idl
RC_SRCS = rsrc.rc
IDL_SRCS = vbsregexp55.idl
@MAKE_TEST_RULES@

6
dlls/wbemdisp/Makefile.in
View File

@ -5,8 +5,8 @@ C_SRCS = \
locator.c \
main.c
IDL_R_SRCS = wbemdisp_classes.idl
IDL_TLB_SRCS = wbemdisp_tlb.idl
IDL_SRCS = \
wbemdisp_classes.idl \
wbemdisp_tlb.idl
@MAKE_DLL_RULES@

2
dlls/wbemprox/Makefile.in
View File

@ -14,7 +14,7 @@ C_SRCS = \
table.c \
wbemlocator.c
IDL_R_SRCS = wbemprox.idl
IDL_SRCS = wbemprox.idl
BISON_SRCS = wql.y

2
dlls/wiaservc/Makefile.in
View File

@ -7,7 +7,7 @@ C_SRCS = \
wiadevmgr.c \
wiaservc_main.c
IDL_R_SRCS = wiaservc.idl
IDL_SRCS = wiaservc.idl
RC_SRCS = rsrc.rc

3
dlls/windowscodecs/Makefile.in
View File

@ -36,8 +36,7 @@ C_SRCS = \
RC_SRCS = version.rc
IDL_P_SRCS = windowscodecs_wincodec.idl
IDL_R_SRCS = windowscodecs_wincodec.idl
IDL_SRCS = windowscodecs_wincodec.idl
EXTRA_OBJS = dlldata.o

2
dlls/winhttp/Makefile.in
View File

@ -13,7 +13,7 @@ C_SRCS = \
session.c \
url.c
IDL_TLB_SRCS = winhttp_tlb.idl
IDL_SRCS = winhttp_tlb.idl
RC_SRCS = rsrc.rc

2
dlls/wmiutils/Makefile.in
View File

@ -6,6 +6,6 @@ C_SRCS = \
path.c \
statuscode.c
IDL_R_SRCS = wmiutils_classes.idl
IDL_SRCS = wmiutils_classes.idl
@MAKE_DLL_RULES@

2
dlls/wshom.ocx/Makefile.in
View File

@ -7,6 +7,6 @@ C_SRCS = \
RC_SRCS = wshom.rc
IDL_TLB_SRCS = wshom.idl
IDL_SRCS = wshom.idl
@MAKE_DLL_RULES@

2
dlls/wshom.ocx/tests/Makefile.in
View File

@ -4,6 +4,6 @@ IMPORTS = oleaut32 ole32
C_SRCS = \
wshom.c
IDL_H_SRCS = wshom.idl
IDL_SRCS = wshom.idl
@MAKE_TEST_RULES@

2
dlls/wuapi/Makefile.in
View File

@ -10,6 +10,6 @@ C_SRCS = \
systeminfo.c \
updates.c
IDL_TLB_SRCS = wuapi_tlb.idl
IDL_SRCS = wuapi_tlb.idl
@MAKE_DLL_RULES@

1
include/Makefile.in
View File

@ -630,6 +630,7 @@ SRCDIR_INCLUDES = \
zmouse.h
IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS)
IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS)
@MAKE_RULES@

2
programs/rpcss/Makefile.in
View File

@ -7,7 +7,7 @@ C_SRCS = \
irotp.c \
rpcss_main.c
IDL_S_SRCS = \
IDL_SRCS = \
epm.idl \
irot.idl

2
programs/services/Makefile.in
View File

@ -7,6 +7,6 @@ C_SRCS = \
services.c \
utils.c
IDL_S_SRCS = svcctl.idl
IDL_SRCS = svcctl.idl
@MAKE_PROG_RULES@

2
programs/wscript/Makefile.in
View File

@ -10,6 +10,6 @@ C_SRCS = \
host.c \
main.c
IDL_TLB_SRCS = ihost.idl
IDL_SRCS = ihost.idl
@MAKE_PROG_RULES@

29
tools/make_makefiles
View File

@ -276,7 +276,7 @@ sub parse_makefile($)
${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB";
next;
}
if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/)
if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/)
{
my $var = $1;
my @list = split(/\s+/, $2);
@ -432,14 +432,7 @@ sub assign_sources_to_makefiles(@)
}
elsif ($name =~ /\.idl$/)
{
my %flags = get_makedep_flags( $file );
push @{${$make}{"=IDL_C_SRCS"}}, $name if defined $flags{"client"};
push @{${$make}{"=IDL_H_SRCS"}}, $name if defined $flags{"header"} || !(keys %flags);
push @{${$make}{"=IDL_I_SRCS"}}, $name if defined $flags{"ident"};
push @{${$make}{"=IDL_P_SRCS"}}, $name if defined $flags{"proxy"};
push @{${$make}{"=IDL_R_SRCS"}}, $name if defined $flags{"register"};
push @{${$make}{"=IDL_S_SRCS"}}, $name if defined $flags{"server"};
push @{${$make}{"=IDL_TLB_SRCS"}}, $name if defined $flags{"typelib"};
push @{${$make}{"=IDL_SRCS"}}, $name;
${${$make}{"=flags"}}{"clean"} = 1;
}
elsif ($name =~ /\.man\.in$/)
@ -459,7 +452,7 @@ sub assign_sources_to_makefiles(@)
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)";
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)";
unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)";
unshift @{${$make}{"=IDL_H_SRCS"}}, "\$(PUBLIC_IDL_H_SRCS) \$(PRIVATE_IDL_H_SRCS)";
unshift @{${$make}{"=IDL_SRCS"}}, "\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)";
# preserve shared source files from the parent makefile
foreach my $file (@makefiles)
@ -568,20 +561,16 @@ sub update_makefiles(@)
replace_makefile_variable( $file, "C_SRCS" );
replace_makefile_variable( $file, "OBJC_SRCS" );
replace_makefile_variable( $file, "RC_SRCS" );
replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" );
replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );
replace_makefile_variable( $file, "IDL_C_SRCS" );
replace_makefile_variable( $file, "IDL_H_SRCS" );
replace_makefile_variable( $file, "IDL_I_SRCS" );
replace_makefile_variable( $file, "IDL_P_SRCS" );
replace_makefile_variable( $file, "IDL_R_SRCS" );
replace_makefile_variable( $file, "IDL_S_SRCS" );
replace_makefile_variable( $file, "IDL_TLB_SRCS" );
replace_makefile_variable( $file, "IDL_SRCS" );
replace_makefile_variable( $file, "XTEMPLATE_SRCS" );
replace_makefile_variable( $file, "IN_SRCS" );
replace_makefile_variable( $file, "IMPLIB_SRCS" );
replace_makefile_variable( $file, "SRCDIR_INCLUDES" );
replace_makefile_variable( $file, "MANPAGES" );
next unless $file eq "include/Makefile";
replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" );
replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );
replace_makefile_variable( $file, "IDL_TLB_SRCS" );
replace_makefile_variable( $file, "SRCDIR_INCLUDES" );
}
push @lines, "dnl End of auto-generated output commands\n";

8
tools/makedep.c
View File

@ -2050,13 +2050,7 @@ static void update_makefile( const char *path )
"OBJC_SRCS",
"RC_SRCS",
"MC_SRCS",
"IDL_H_SRCS",
"IDL_C_SRCS",
"IDL_I_SRCS",
"IDL_P_SRCS",
"IDL_S_SRCS",
"IDL_R_SRCS",
"IDL_TLB_SRCS",
"IDL_SRCS",
"BISON_SRCS",
"LEX_SRCS",
"XTEMPLATE_SRCS",