makefiles: Always use the global SOURCES variable for .idl files.

dlls/activeds.tlb/Makefile.in

@@ -2,4 +2,5 @@ MODULE = activeds.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-IDL_SRCS = activeds_tlb.idl
+SOURCES = \
+	activeds_tlb.idl

dlls/activeds/Makefile.in

@@ -4,9 +4,7 @@ IMPORTS   = advapi32 ole32 oleaut32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	activeds.idl \
 	activeds_main.c \
 	pathname.c
-
-IDL_SRCS = \
-	activeds.idl

dlls/actxprxy/Makefile.in

 MODULE    = actxprxy.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4
 
-C_SRCS = \
-	usrmarshal.c
-
-IDL_SRCS = \
+SOURCES = \
 	actxprxy_activscp.idl \
 	actxprxy_comcat.idl \
 	actxprxy_docobj.idl \
@@ -16,6 +13,7 @@ IDL_SRCS = \
 	actxprxy_servprov.idl \
 	actxprxy_shldisp.idl \
 	actxprxy_shobjidl.idl \
-	actxprxy_urlhist.idl
+	actxprxy_urlhist.idl \
+	usrmarshal.c
 
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION

dlls/adsldp/Makefile.in

@@ -4,12 +4,9 @@ DELAYIMPORTS = netapi32 wldap32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	adsldp.c \
+	adsldp.idl \
 	ldap.c \
+	rsrc.rc \
 	schema.c
-
-IDL_SRCS = \
-	adsldp.idl
-
-RC_SRCS = rsrc.rc

dlls/amstream/Makefile.in

 MODULE    = amstream.dll
 IMPORTS   = strmiids strmbase uuid ole32 advapi32 ddraw
 
-C_SRCS = \
+SOURCES = \
+	amstream_classes.idl \
 	audiodata.c \
 	audiostream.c \
 	ddrawstream.c \
 	filter.c \
 	main.c \
-	multimedia.c
-
-IDL_SRCS = amstream_classes.idl
-
-RC_SRCS = version.rc
+	multimedia.c \
+	version.rc

dlls/appxdeploymentclient/Makefile.in

 MODULE  = appxdeploymentclient.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	package.c
-
-IDL_SRCS = \
-	classes.idl

dlls/atl/Makefile.in

@@ -3,12 +3,10 @@ IMPORTLIB = atl
 IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_30
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl30.c \
 	atl_ax.c \
-	registrar.c
-
-IDL_SRCS = \
 	atl_classes.idl \
-	atl_lib.idl
+	atl_lib.idl \
+	registrar.c

dlls/atl100/Makefile.in

@@ -4,9 +4,8 @@ IMPORTS   = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_100
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl

dlls/atl110/Makefile.in

@@ -4,9 +4,8 @@ IMPORTS   = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_110
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl

dlls/atl80/Makefile.in

@@ -4,12 +4,10 @@ IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_80
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
 	atl80.c \
+	atl80.rc \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
-
-RC_SRCS = atl80.rc

dlls/atl90/Makefile.in

@@ -3,11 +3,9 @@ IMPORTS   = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi
 EXTRADEFS = -D_ATL_VER=_ATL_VER_90
 PARENTSRC = ../atl
 
-C_SRCS = \
+SOURCES = \
 	atl.c \
+	atl90.rc \
 	atl_ax.c \
+	atl_lib.idl \
 	registrar.c
-
-IDL_SRCS = atl_lib.idl
-
-RC_SRCS = atl90.rc

dlls/avifil32/Makefile.in

@@ -2,9 +2,11 @@ MODULE    = avifil32.dll
 IMPORTLIB = avifil32
 IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
 
-C_SRCS = \
+SOURCES = \
 	acmstream.c \
 	api.c \
+	avifil32.idl \
+	avifil32.rc \
 	avifile.c \
 	editstream.c \
 	extrachunk.c \
@@ -14,8 +16,4 @@ C_SRCS = \
 	tmpfile.c \
 	wavfile.c
 
-IDL_SRCS = avifil32.idl
-
-RC_SRCS = avifil32.rc
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=avifil32_

dlls/browseui/Makefile.in

@@ -3,13 +3,11 @@ IMPORTS   = uuid ole32 comctl32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	aclmulti.c \
 	aclsource.c \
+	browseui.rc \
+	browseui_classes.idl \
 	browseui_main.c \
 	compcatcachedaemon.c \
 	progressdlg.c
-
-IDL_SRCS = browseui_classes.idl
-
-RC_SRCS = browseui.rc

dlls/combase/Makefile.in

@@ -4,11 +4,13 @@ IMPORTLIB = combase
 IMPORTS   = advapi32 ole32 user32 gdi32 uuid rpcrt4
 DELAYIMPORTS = oleaut32
 
-C_SRCS = \
+SOURCES = \
 	apartment.c \
 	combase.c \
+	dcom.idl \
 	errorinfo.c \
 	hglobalstream.c \
+	irpcss.idl \
 	malloc.c \
 	marshal.c \
 	roapi.c \
@@ -16,7 +18,3 @@ C_SRCS = \
 	string.c \
 	stubmanager.c \
 	usrmarshal.c
-
-IDL_SRCS = \
-	dcom.idl \
-	irpcss.idl

dlls/comsvcs/Makefile.in

@@ -4,10 +4,8 @@ IMPORTS   = ole32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	comsvcs_classes.idl \
+	comsvcs_tlb.idl \
 	main.c \
 	property.c
-
-IDL_SRCS = \
-	comsvcs_classes.idl \
-	comsvcs_tlb.idl

dlls/cryptowinrt/Makefile.in

 MODULE = cryptowinrt.dll
 IMPORTS = combase bcrypt uuid
 
-C_SRCS = \
+SOURCES = \
 	async.c \
-	credentials.c \
-	main.c
-
-IDL_SRCS = \
 	classes.idl \
+	credentials.c \
+	main.c \
 	provider.idl

dlls/d3dxof/Makefile.in

@@ -2,12 +2,10 @@ MODULE    = d3dxof.dll
 IMPORTLIB = d3dxof
 IMPORTS   = dxguid uuid ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	d3dxof.c \
+	d3dxof.idl \
 	main.c \
 	mszip.c \
-	parsing.c
-
-IDL_SRCS = d3dxof.idl
-
-RC_SRCS = version.rc
+	parsing.c \
+	version.rc

dlls/ddraw/Makefile.in

@@ -2,9 +2,10 @@ MODULE    = ddraw.dll
 IMPORTLIB = ddraw
 IMPORTS   = dxguid uuid wined3d user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	clipper.c \
 	ddraw.c \
+	ddraw_classes.idl \
 	device.c \
 	executebuffer.c \
 	light.c \
@@ -13,9 +14,6 @@ C_SRCS = \
 	palette.c \
 	surface.c \
 	utils.c \
+	version.rc \
 	vertexbuffer.c \
 	viewport.c
-
-IDL_SRCS = ddraw_classes.idl
-
-RC_SRCS = version.rc

dlls/ddrawex/Makefile.in

 MODULE    = ddrawex.dll
 IMPORTS   = dxguid uuid ddraw ole32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	ddraw.c \
+	ddrawex.idl \
 	main.c \
-	surface.c
-
-IDL_SRCS = ddrawex.idl
-
-RC_SRCS = version.rc
+	surface.c \
+	version.rc

dlls/devenum/Makefile.in

@@ -2,13 +2,10 @@ MODULE    = devenum.dll
 IMPORTS   = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo
 DELAYIMPORTS = msvfw32
 
-C_SRCS = \
+SOURCES = \
 	createdevenum.c \
+	devenum.rc \
+	devenum_classes.idl \
 	devenum_main.c \
 	mediacatenum.c \
 	parsedisplayname.c
-
-IDL_SRCS = \
-	devenum_classes.idl
-
-RC_SRCS = devenum.rc

dlls/dhtmled.ocx/Makefile.in

 MODULE    = dhtmled.ocx
 IMPORTS   = uuid ole32 oleaut32 user32 gdi32
 
-RC_SRCS   = dhtmled.rc
-
-C_SRCS = \
+SOURCES = \
+	dhtmled.rc \
+	dhtmled_tlb.idl \
 	edit.c \
 	main.c
-
-IDL_SRCS = dhtmled_tlb.idl

dlls/diasymreader/Makefile.in

@@ -3,10 +3,8 @@ IMPORTS   = uuid rpcrt4
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	diasymreader.idl \
+	diasymreader.rc \
 	main.c \
 	writer.c
-
-IDL_SRCS = diasymreader.idl
-
-RC_SRCS = diasymreader.rc

dlls/dinput/Makefile.in

@@ -3,19 +3,16 @@ IMPORTLIB = dinput
 IMPORTS   = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
 
-C_SRCS = \
+SOURCES = \
 	ansi.c \
 	config.c \
 	data_formats.c \
 	device.c \
 	dinput.c \
+	dinput.rc \
+	dinput_classes.idl \
 	dinput_main.c \
 	joystick_hid.c \
 	keyboard.c \
-	mouse.c
-
-IDL_SRCS = dinput_classes.idl
-
-RC_SRCS = \
-	dinput.rc \
+	mouse.c \
 	version.rc

dlls/dinput8/Makefile.in

@@ -4,19 +4,16 @@ IMPORTS   = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi
 EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
 PARENTSRC = ../dinput
 
-C_SRCS = \
+SOURCES = \
 	ansi.c \
 	config.c \
 	data_formats.c \
 	device.c \
 	dinput.c \
+	dinput.rc \
+	dinput8.idl \
 	dinput_main.c \
 	joystick_hid.c \
 	keyboard.c \
-	mouse.c
-
-IDL_SRCS = dinput8.idl
-
-RC_SRCS = \
-	dinput.rc \
+	mouse.c \
 	version.rc

dlls/directmanipulation/Makefile.in

@@ -3,7 +3,6 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-IDL_SRCS = directmanip.idl
-
-C_SRCS = \
+SOURCES = \
+	directmanip.idl \
 	directmanipulation.c

dlls/dispex/Makefile.in

 MODULE    = dispex.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 
-C_SRCS = \
+SOURCES = \
+	disp_ex.idl \
 	usrmarshal.c
 
-IDL_SRCS = \
-	disp_ex.idl
-
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION

dlls/dmband/Makefile.in

@@ -2,12 +2,10 @@ MODULE    = dmband.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	band.c \
 	bandtrack.c \
+	dmband.idl \
 	dmband_main.c \
-	dmobject.c
-
-IDL_SRCS = dmband.idl
-
-RC_SRCS = version.rc
+	dmobject.c \
+	version.rc

dlls/dmcompos/Makefile.in

@@ -2,14 +2,12 @@ MODULE    = dmcompos.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	chordmap.c \
 	chordmaptrack.c \
 	composer.c \
+	dmcompos.idl \
 	dmcompos_main.c \
 	dmobject.c \
-	signposttrack.c
-
-IDL_SRCS = dmcompos.idl
-
-RC_SRCS = version.rc
+	signposttrack.c \
+	version.rc

dlls/dmime/Makefile.in

@@ -2,8 +2,9 @@ MODULE    = dmime.dll
 IMPORTS   = dxguid uuid dsound ole32 user32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	audiopath.c \
+	dmime.idl \
 	dmime_main.c \
 	dmobject.c \
 	graph.c \
@@ -18,9 +19,6 @@ C_SRCS = \
 	sysextrack.c \
 	tempotrack.c \
 	timesigtrack.c \
+	version.rc \
 	wave.c \
 	wavetrack.c
-
-IDL_SRCS = dmime.idl
-
-RC_SRCS = version.rc

dlls/dmloader/Makefile.in

@@ -2,14 +2,12 @@ MODULE    = dmloader.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	container.c \
 	debug.c \
+	dmloader.idl \
 	dmloader_main.c \
 	dmobject.c \
 	loader.c \
-	loaderstream.c
-
-IDL_SRCS = dmloader.idl
-
-RC_SRCS = version.rc
+	loaderstream.c \
+	version.rc

dlls/dmscript/Makefile.in

@@ -2,12 +2,10 @@ MODULE    = dmscript.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	dmobject.c \
+	dmscript.idl \
 	dmscript_main.c \
+	rsrc.rc \
 	script.c \
 	scripttrack.c
-
-IDL_SRCS = dmscript.idl
-
-RC_SRCS = rsrc.rc

dlls/dmstyle/Makefile.in

@@ -2,18 +2,16 @@ MODULE    = dmstyle.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	auditiontrack.c \
 	chordtrack.c \
 	commandtrack.c \
 	dmobject.c \
+	dmstyle.idl \
 	dmstyle_main.c \
 	dmutils.c \
 	motiftrack.c \
 	mutetrack.c \
 	style.c \
-	styletrack.c
-
-IDL_SRCS = dmstyle.idl
-
-RC_SRCS = version.rc
+	styletrack.c \
+	version.rc

dlls/dmsynth/Makefile.in

@@ -3,11 +3,9 @@ IMPORTS   = $(FLUIDSYNTH_PE_LIBS) dxguid uuid ole32 advapi32 user32
 EXTRAINCL = $(FLUIDSYNTH_PE_CFLAGS)
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
+	dmsynth.idl \
 	dmsynth_main.c \
 	synth.c \
-	synthsink.c
-
-IDL_SRCS = dmsynth.idl
-
-RC_SRCS = version.rc
+	synthsink.c \
+	version.rc

dlls/dmusic/Makefile.in

 MODULE    = dmusic.dll
 IMPORTS   = dxguid uuid ole32 advapi32 dsound user32 winmm
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	clock.c \
 	collection.c \
 	dmobject.c \
 	dmusic.c \
+	dmusic.idl \
 	dmusic_main.c \
 	download.c \
 	instrument.c \
 	port.c \
+	version.rc \
 	wave.c
-
-IDL_SRCS = dmusic.idl
-
-RC_SRCS = version.rc

dlls/dplayx/Makefile.in

@@ -2,17 +2,15 @@ MODULE    = dplayx.dll
 IMPORTLIB = dplayx
 IMPORTS   = dxguid uuid winmm ole32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	dpclassfactory.c \
 	dplay.c \
 	dplaysp.c \
+	dplayx.idl \
 	dplayx_global.c \
 	dplayx_main.c \
 	dplayx_messages.c \
 	dplobby.c \
 	lobbysp.c \
-	name_server.c
-
-IDL_SRCS = dplayx.idl
-
-RC_SRCS = version.rc
+	name_server.c \
+	version.rc

dlls/dpnet/Makefile.in

@@ -2,15 +2,13 @@ MODULE    = dpnet.dll
 IMPORTLIB = dpnet
 IMPORTS   = dxguid uuid ole32 advapi32 ws2_32
 
-C_SRCS = \
+SOURCES = \
 	address.c \
 	client.c \
+	dpnet.idl \
 	dpnet_main.c \
 	lobbiedapp.c \
 	peer.c \
 	server.c \
-	threadpool.c
-
-IDL_SRCS = dpnet.idl
-
-RC_SRCS = version.rc
+	threadpool.c \
+	version.rc

dlls/dpvoice/Makefile.in

@@ -3,11 +3,9 @@ IMPORTS   = dxguid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	client.c \
+	dpvoice.idl \
 	main.c \
-	server.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = dpvoice.idl
+	server.c \
+	version.rc

dlls/dsdmo/Makefile.in

@@ -3,10 +3,7 @@ IMPORTS   = dmoguids strmiids uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
-	dsdmo.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	dsdmo.idl \
+	main.c \
+	version.rc

dlls/dsound/Makefile.in

@@ -2,18 +2,16 @@ MODULE    = dsound.dll
 IMPORTLIB = dsound
 IMPORTS   = dxguid uuid winmm ole32 advapi32 user32
 
-C_SRCS = \
+SOURCES = \
 	buffer.c \
 	capture.c \
 	dsound.c \
+	dsound_classes.idl \
 	dsound_convert.c \
 	dsound_main.c \
 	duplex.c \
 	mixer.c \
 	primary.c \
 	propset.c \
-	sound3d.c
-
-IDL_SRCS = dsound_classes.idl
-
-RC_SRCS = version.rc
+	sound3d.c \
+	version.rc

dlls/dsquery/Makefile.in

 MODULE = dsquery.dll
 IMPORTS = uuid
 
-C_SRCS = \
+SOURCES = \
+	dsquery.idl \
 	main.c
-
-IDL_SRCS = \
-	dsquery.idl

dlls/dsuiext/Makefile.in

 MODULE  = dsuiext.dll
 IMPORTS = ole32 uuid
 
-C_SRCS = \
-	dsuiext.c
-
-IDL_SRCS = \
+SOURCES = \
+	dsuiext.c \
 	dsuiext.idl

dlls/dswave/Makefile.in

@@ -2,11 +2,9 @@ MODULE    = dswave.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 PARENTSRC = ../dmusic
 
-C_SRCS = \
+SOURCES = \
 	dmobject.c \
+	dswave.idl \
 	dswave_main.c \
+	version.rc \
 	wave.c
-
-IDL_SRCS = dswave.idl
-
-RC_SRCS = version.rc

dlls/dx8vb/Makefile.in

@@ -3,9 +3,7 @@ IMPORTS   = uuid ole32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = dx8vb.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	dx8vb.idl \
+	main.c \
+	version.rc

dlls/dxdiagn/Makefile.in

 MODULE    = dxdiagn.dll
 IMPORTS   = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	container.c \
 	dxdiag_main.c \
+	dxdiagn.idl \
+	dxdiagn.rc \
 	provider.c
-
-RC_SRCS = dxdiagn.rc
-
-IDL_SRCS = \
-	dxdiagn.idl

dlls/evr/Makefile.in

@@ -5,11 +5,10 @@ DELAYIMPORTS = mfplat
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	evr.c \
+	evr_classes.idl \
 	main.c \
 	mixer.c \
 	presenter.c \
 	sample.c
-
-IDL_SRCS = evr_classes.idl

dlls/explorerframe/Makefile.in

 MODULE    = explorerframe.dll
 IMPORTS   = uuid ole32 comctl32 shell32 user32
 
-C_SRCS = \
+SOURCES = \
+	explorerframe.idl \
 	explorerframe_main.c \
 	nstc.c \
-	taskbarlist.c
-
-IDL_SRCS = explorerframe.idl
-
-RC_SRCS = \
+	taskbarlist.c \
 	version.rc

dlls/gameux/Makefile.in

 MODULE    = gameux.dll
 IMPORTS   = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi
 
-C_SRCS = \
+SOURCES = \
 	factory.c \
 	gameexplorer.c \
-	gamestatistics.c
-
-IDL_SRCS = gameux_tlb.idl
-
-RC_SRCS = rsrc.rc
+	gamestatistics.c \
+	gameux_tlb.idl \
+	rsrc.rc

dlls/geolocation/Makefile.in

 MODULE = geolocation.dll
 IMPORTS = combase uuid
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c
-
-IDL_SRCS = classes.idl

dlls/graphicscapture/Makefile.in

 MODULE  = graphicscapture.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	main.c \
 	session.c
-
-IDL_SRCS = \
-	classes.idl

dlls/hlink/Makefile.in

@@ -3,10 +3,9 @@ IMPORTLIB = hlink
 IMPORTS   = uuid shell32 ole32 advapi32
 DELAYIMPORTS = urlmon
 
-C_SRCS = \
+SOURCES = \
 	browse_ctx.c \
 	extserv.c \
+	hlink_classes.idl \
 	hlink_main.c \
 	link.c
-
-IDL_SRCS = hlink_classes.idl

dlls/hnetcfg/Makefile.in

@@ -3,15 +3,13 @@ IMPORTS   = oleaut32 ole32 advapi32 mpr uuid
 DELAYIMPORTS = ws2_32 winhttp shcore xmllite
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	apps.c \
 	hnetcfg.c \
+	hnetcfg.idl \
+	hnetcfg_tlb.idl \
 	manager.c \
 	policy.c \
 	port.c \
 	profile.c \
 	service.c
-
-IDL_SRCS = \
-	hnetcfg.idl \
-	hnetcfg_tlb.idl

dlls/hvsimanagementapi/Makefile.in

 MODULE  = hvsimanagementapi.dll
 IMPORTS = combase
 
-C_SRCS = \
+SOURCES = \
+	classes.idl \
 	host.c \
 	main.c
-
-IDL_SRCS = \
-	classes.idl

dlls/ia2comproxy/Makefile.in

 MODULE    = ia2comproxy.dll
 IMPORTS   = uuid oleacc oleaut32 ole32 rpcrt4
 
-IDL_SRCS = \
+SOURCES = \
 	ia2_classes.idl \
 	oleacc_classes.idl
 

dlls/ieproxy/Makefile.in

 MODULE = ieproxy.dll
 IMPORTS = uuid ole32 rpcrt4
 
-IDL_SRCS = \
+SOURCES = \
 	ieproxy_ieautomation.idl \
 	ieproxy_perhist.idl
 

dlls/inetcomm/Makefile.in

@@ -4,8 +4,10 @@ IMPORTS   = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	imaptransport.c \
+	inetcomm.idl \
+	inetcomm.rc \
 	inetcomm_main.c \
 	internettransport.c \
 	mimeintl.c \
@@ -13,7 +15,3 @@ C_SRCS = \
 	pop3transport.c \
 	protocol.c \
 	smtptransport.c
-
-RC_SRCS = inetcomm.rc
-
-IDL_SRCS = inetcomm.idl

dlls/infosoft/Makefile.in

@@ -3,8 +3,7 @@ IMPORTS   = uuid advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	infosoft.idl \
 	infosoft_main.c \
 	wordbreaker.c
-
-IDL_SRCS = infosoft.idl

dlls/inseng/Makefile.in

@@ -3,6 +3,6 @@ IMPORTS   = uuid ole32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = inseng_main.c
-
-IDL_SRCS = inseng_classes.idl
+SOURCES = \
+	inseng_classes.idl \
+	inseng_main.c

dlls/itss/Makefile.in

 MODULE    = itss.dll
 IMPORTS   = uuid urlmon shlwapi ole32
 
-C_SRCS = \
+SOURCES = \
 	chm_lib.c \
 	itss.c \
+	itss.idl \
 	lzx.c \
 	moniker.c \
 	protocol.c \
+	rsrc.rc \
 	storage.c
-
-IDL_SRCS = itss.idl
-
-RC_SRCS = rsrc.rc

dlls/mf/Makefile.in

@@ -5,11 +5,13 @@ DELAYIMPORTS = evr urlmon user32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	clock.c \
 	copier.c \
 	evr.c \
 	main.c \
+	mf.idl \
+	mf.rc \
 	quality.c \
 	samplegrabber.c \
 	sar.c \
@@ -17,7 +19,3 @@ C_SRCS = \
 	session.c \
 	topology.c \
 	topology_loader.c
-
-IDL_SRCS = mf.idl
-
-RC_SRCS = mf.rc

dlls/mfmediaengine/Makefile.in

@@ -3,9 +3,7 @@ IMPORTS = oleaut32 ole32 mfplat mf mfuuid dxguid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	main.c
-
-IDL_SRCS = \
+SOURCES = \
+	main.c \
 	mediaengine.idl \
 	mediaengine_classes.idl

dlls/mfreadwrite/Makefile.in

@@ -5,8 +5,7 @@ DELAYIMPORTS = mf
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	mf_classes.idl \
 	reader.c \
 	writer.c
-
-IDL_SRCS = mf_classes.idl

dlls/mfsrcsnk/Makefile.in

@@ -4,8 +4,7 @@ IMPORTS   = ole32 mfplat mfuuid uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	factory.c \
+	mfsrcsnk.idl \
 	wave.c
-
-IDL_SRCS = mfsrcsnk.idl

dlls/mmcndmgr/Makefile.in

@@ -3,7 +3,6 @@ IMPORTS   = uuid oleaut32 ole32 user32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	mmcndmgr.c
-
-IDL_SRCS = mmcndmgr.idl
+SOURCES = \
+	mmcndmgr.c \
+	mmcndmgr.idl

dlls/mmdevapi/Makefile.in

 MODULE    = mmdevapi.dll
 IMPORTS   = ole32 oleaut32 user32 advapi32 version
 
-C_SRCS = \
+SOURCES = \
 	audiosessionmanager.c \
 	audiovolume.c \
 	client.c \
 	devenum.c \
 	main.c \
+	mmdevapi_classes.idl \
 	session.c \
 	spatialaudio.c
-
-IDL_SRCS = mmdevapi_classes.idl

dlls/mp3dmod/Makefile.in

@@ -3,8 +3,6 @@ IMPORTS   = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbas
 EXTRAINCL = $(MPG123_PE_CFLAGS)
 EXTRADEFS = -DMPG123_NO_LARGENAME
 
-C_SRCS = \
-	mp3dmod.c
-
-IDL_SRCS = \
+SOURCES = \
+	mp3dmod.c \
 	mp3dmod.idl

dlls/msado15/Makefile.in

 MODULE    = msado15.dll
 IMPORTS   = oleaut32 ole32
 
-C_SRCS = \
+SOURCES = \
 	command.c \
 	connection.c \
 	main.c \
+	msado15_classes.idl \
+	msado15_tlb.idl \
 	recordset.c \
 	stream.c
-
-IDL_SRCS = \
-	msado15_classes.idl \
-	msado15_tlb.idl

dlls/mscoree/Makefile.in

@@ -3,15 +3,14 @@ IMPORTS   = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	assembly.c \
 	config.c \
 	cordebug.c \
 	corruntimehost.c \
 	metadata.c \
 	metahost.c \
+	mscoree_classes.idl \
 	mscoree_main.c
 
-IDL_SRCS = mscoree_classes.idl
-
 metahost_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""

dlls/mscoree/tests/Makefile.in

 TESTDLL   = mscoree.dll
 IMPORTS   = ole32 shlwapi uuid shell32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	comtest.c \
 	debugging.c \
+	interfaces.idl \
 	metahost.c \
-	mscoree.c
-
-RC_SRCS = resource.rc
-IDL_SRCS = interfaces.idl
+	mscoree.c \
+	resource.rc

dlls/msctf/Makefile.in

@@ -3,7 +3,7 @@ IMPORTS   = uuid ole32 oleaut32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	categorymgr.c \
 	compartmentmgr.c \
 	context.c \
@@ -12,10 +12,7 @@ C_SRCS = \
 	inputprocessor.c \
 	langbarmgr.c \
 	msctf.c \
+	msctf_classes.idl \
 	range.c \
-	threadmgr.c
-
-IDL_SRCS = msctf_classes.idl
-
-RC_SRCS = \
+	threadmgr.c \
 	version.rc

dlls/msctfp/Makefile.in

 MODULE    = msctfp.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-IDL_SRCS = msctfp.idl
+SOURCES = \
+	msctfp.idl
 
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

dlls/msdaps/Makefile.in

@@ -2,13 +2,11 @@ MODULE    = msdaps.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 EXTRAIDLFLAGS = --win32-align=2
 
-C_SRCS = \
+SOURCES = \
 	main.c \
+	msdaps.idl \
 	row_server.c \
+	row_server.idl \
 	usrmarshal.c
 
-IDL_SRCS = \
-	msdaps.idl \
-	row_server.idl
-
 dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_

dlls/msdasql/Makefile.in

@@ -3,10 +3,8 @@ IMPORTS   = uuid ole32 oleaut32 odbc32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	msdasql.rc \
+	msdasql_classes.idl \
 	msdasql_main.c \
 	session.c
-
-RC_SRCS = msdasql.rc
-
-IDL_SRCS = msdasql_classes.idl

dlls/mshtml.tlb/Makefile.in

@@ -2,4 +2,5 @@ MODULE    = mshtml.tlb
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-IDL_SRCS = mshtml_tlb.idl
+SOURCES = \
+	mshtml_tlb.idl

dlls/mshtml/Makefile.in

@@ -3,7 +3,7 @@ IMPORTLIB = mshtml
 IMPORTS   = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
 DELAYIMPORTS = wininet inetcomm
 
-C_SRCS = \
+SOURCES = \
 	conpoint.c \
 	dispex.c \
 	editor.c \
@@ -40,11 +40,15 @@ C_SRCS = \
 	ifacewrap.c \
 	loadopts.c \
 	main.c \
+	mshtml.rc \
+	mshtml_classes.idl \
+	mshtml_private_iface.idl \
 	mutation.c \
 	navigate.c \
 	npplugin.c \
 	nsembed.c \
 	nsevents.c \
+	nsiface.idl \
 	nsio.c \
 	nsservice.c \
 	olecmd.c \
@@ -64,10 +68,3 @@ C_SRCS = \
 	xmlhttprequest.c
 
 nsembed_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""
-
-RC_SRCS = mshtml.rc
-
-IDL_SRCS = \
-	mshtml_classes.idl \
-	mshtml_private_iface.idl \
-	nsiface.idl

dlls/mshtml/tests/Makefile.in

 TESTDLL   = mshtml.dll
 IMPORTS   = ole32 oleaut32 shlwapi wininet user32 urlmon gdi32 advapi32
-C_SRCS = \
+
+SOURCES = \
 	activex.c \
 	dom.c \
 	events.c \
@@ -8,10 +9,8 @@ C_SRCS = \
 	htmllocation.c \
 	misc.c \
 	protocol.c \
+	rsrc.rc \
 	script.c \
 	style.c \
+	test_tlb.idl \
 	xmlhttprequest.c
-
-IDL_SRCS = test_tlb.idl
-
-RC_SRCS = rsrc.rc

dlls/msident/Makefile.in

@@ -2,7 +2,6 @@ MODULE    = msident.dll
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	msident.c
-
-IDL_SRCS = msident_classes.idl
+SOURCES = \
+	msident.c \
+	msident_classes.idl

dlls/msimtf/Makefile.in

@@ -3,8 +3,7 @@ IMPORTS   = uuid imm32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	activeimmapp.c \
-	main.c
-
-IDL_SRCS = msimtf.idl
+	main.c \
+	msimtf.idl

dlls/msscript.ocx/Makefile.in

 MODULE    = msscript.ocx
-RC_SRCS   = msscript.rc
-IDL_SRCS  = msscript.idl
 IMPORTS   = gdi32 user32 ole32 oleaut32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	msscript.c
+SOURCES = \
+	msscript.c \
+	msscript.idl \
+	msscript.rc

dlls/msscript.ocx/tests/Makefile.in

 TESTDLL   = msscript.ocx
 IMPORTS   = user32 gdi32 ole32 oleaut32 advapi32
 
-C_SRCS = \
-	msscript.c
-
-IDL_SRCS = msscript.idl
+SOURCES = \
+	msscript.c \
+	msscript.idl

dlls/mstask/Makefile.in

 MODULE    = mstask.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-C_SRCS = \
+SOURCES = \
+	atsvc.idl \
 	factory.c \
+	mstask_local.idl \
 	mstask_main.c \
 	task.c \
 	task_scheduler.c \
 	task_trigger.c
-
-IDL_SRCS = \
-	atsvc.idl \
-	mstask_local.idl

dlls/msxml/Makefile.in

 MODULE = msxml.dll
 
-IDL_SRCS = msxml_tlb.idl
-
-RC_SRCS = rsrc.rc
+SOURCES = \
+	msxml_tlb.idl \
+	rsrc.rc

dlls/msxml2/Makefile.in

 MODULE = msxml2.dll
 
-IDL_SRCS = msxml2_tlb.idl
+SOURCES = \
+	msxml2_tlb.idl

dlls/msxml3/tests/Makefile.in

 TESTDLL   = msxml3.dll
 IMPORTS   = oleaut32 ole32 user32 shlwapi
 
-C_SRCS = \
+SOURCES = \
 	domdoc.c \
 	httpreq.c \
+	rsrc.rc \
 	saxreader.c \
 	schema.c \
 	xmldoc.c \
 	xmlparser.c \
+	xmlparser.idl \
 	xmlview.c
-
-IDL_SRCS = xmlparser.idl
-
-RC_SRCS = rsrc.rc

dlls/msxml4/Makefile.in

 MODULE    = msxml4.dll
 IMPORTS   = ole32 advapi32
 
-IDL_SRCS = msxml4_tlb.idl
-RC_SRCS = rsrc.rc
+SOURCES = \
+	msxml4_tlb.idl \
+	rsrc.rc

dlls/msxml6/Makefile.in

 MODULE    = msxml6.dll
 IMPORTS   = oleaut32 ole32 advapi32
 
-RC_SRCS = rsrc.rc
-IDL_SRCS = msxml6_tlb.idl
+SOURCES = \
+	msxml6_tlb.idl \
+	rsrc.rc

dlls/netapi32/Makefile.in

@@ -3,13 +3,11 @@ UNIXLIB   = netapi32.so
 IMPORTLIB = netapi32
 IMPORTS   = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi
 
-C_SRCS = \
+SOURCES = \
+	atsvc.idl \
 	nbcmdqueue.c \
 	nbnamecache.c \
 	nbt.c \
 	netapi32.c \
 	netbios.c \
 	unixlib.c
-
-IDL_SRCS = \
-	atsvc.idl

dlls/netcfgx/Makefile.in

@@ -3,8 +3,7 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	main.c \
-	netcfg.c
-
-IDL_SRCS = netcfgx_classes.idl
+	netcfg.c \
+	netcfgx_classes.idl

dlls/netprofm/Makefile.in

@@ -3,8 +3,7 @@ IMPORTS   = iphlpapi
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	list.c \
-	main.c
-
-IDL_SRCS = netprofm.idl
+	main.c \
+	netprofm.idl

dlls/ntoskrnl.exe/Makefile.in

@@ -3,13 +3,10 @@ IMPORTLIB = ntoskrnl
 IMPORTS   = advapi32 hal msvcrt
 DELAYIMPORTS = rpcrt4 setupapi
 
-C_SRCS = \
+SOURCES = \
 	instr.c \
 	ntoskrnl.c \
+	ntoskrnl.rc \
+	plugplay.idl \
 	pnp.c \
 	sync.c
-
-RC_SRCS = ntoskrnl.rc
-
-IDL_SRCS = \
-	plugplay.idl

dlls/objsel/Makefile.in

 MODULE    = objsel.dll
 IMPORTS   = strmiids uuid ole32 advapi32
 
-C_SRCS = \
-	objsel.c
-
-IDL_SRCS = objsel_classes.idl
-
-RC_SRCS = objsel.rc
+SOURCES = \
+	objsel.c \
+	objsel.rc \
+	objsel_classes.idl

dlls/oleacc/Makefile.in

@@ -2,14 +2,12 @@ MODULE    = oleacc.dll
 IMPORTLIB = oleacc
 IMPORTS   = uuid oleaut32 ole32 user32 rpcrt4
 
-C_SRCS = \
+SOURCES = \
 	client.c \
 	main.c \
+	oleacc.rc \
+	oleacc_classes.idl \
 	propservice.c \
 	window.c
 
-IDL_SRCS = oleacc_classes.idl
-
-RC_SRCS = oleacc.rc
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEACC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL

dlls/oleaut32/Makefile.in

@@ -4,11 +4,14 @@ IMPORTLIB = oleaut32
 IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32 urlmon windowscodecs
 
-C_SRCS = \
+SOURCES = \
 	connpt.c \
 	dispatch.c \
 	hash.c \
 	oleaut.c \
+	oleaut32.rc \
+	oleaut32_oaidl.idl \
+	oleaut32_ocidl.idl \
 	olefont.c \
 	olepicture.c \
 	olepropframe.c \
@@ -20,10 +23,4 @@ C_SRCS = \
 	variant.c \
 	vartype.c
 
-RC_SRCS = oleaut32.rc
-
-IDL_SRCS = \
-	oleaut32_oaidl.idl \
-	oleaut32_ocidl.idl
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer

dlls/oleaut32/tests/Makefile.in

 TESTDLL   = oleaut32.dll
 IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	dispatch.c \
 	olefont.c \
 	olepicture.c \
 	safearray.c \
+	test_reg.idl \
+	test_simple.idl \
+	test_tlb.idl \
 	tmarshal.c \
+	tmarshal.idl \
+	tmarshal.rc \
 	typelib.c \
 	usrmarshal.c \
 	varformat.c \
 	vartest.c \
 	vartype.c
-
-RC_SRCS = tmarshal.rc
-
-IDL_SRCS = \
-	test_reg.idl \
-	test_simple.idl \
-	test_tlb.idl \
-	tmarshal.idl

dlls/oledb32/Makefile.in

 MODULE    = oledb32.dll
 IMPORTS   = uuid oleaut32 ole32 comctl32 user32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	convert.c \
+	convert.idl \
 	datainit.c \
 	dslocator.c \
 	errorinfo.c \
 	main.c \
-	rowpos.c
-
-IDL_SRCS = \
-	convert.idl \
 	oledb32_classes.idl \
-	oledb32_typelib.idl
-
-RC_SRCS = version.rc
+	oledb32_typelib.idl \
+	rowpos.c \
+	version.rc

dlls/oledb32/tests/Makefile.in

 TESTDLL   = oledb32.dll
 IMPORTS   = uuid oleaut32 ole32 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	convert.c \
+	convert.idl \
 	database.c \
 	marshal.c
-
-IDL_SRCS = convert.idl

dlls/olepro32/Makefile.in

@@ -2,8 +2,7 @@ MODULE    = olepro32.dll
 IMPORTLIB = olepro32
 IMPORTS   = oleaut32
 
-C_SRCS = olepro32stubs.c
-
-IDL_SRCS = olepro.idl
-
-RC_SRCS = version.rc
+SOURCES = \
+	olepro.idl \
+	olepro32stubs.c \
+	version.rc

dlls/opcservices/Makefile.in

@@ -2,11 +2,9 @@ MODULE    = opcservices.dll
 IMPORTS   = $(ZLIB_PE_LIBS) uuid ole32 advapi32 urlmon xmllite oleaut32
 EXTRAINCL = $(ZLIB_PE_CFLAGS)
 
-C_SRCS = \
+SOURCES = \
 	compress.c \
 	factory.c \
+	opcservices.idl \
 	package.c \
 	uri.c
-
-IDL_SRCS = \
-	opcservices.idl

dlls/packager/Makefile.in

 MODULE = packager.dll
 IMPORTS = uuid shell32 shlwapi user32
 
-C_SRCS = \
+SOURCES = \
+	packager.rc \
+	packager_classes.idl \
 	packager_main.c
-
-RC_SRCS = packager.rc
-IDL_SRCS = packager_classes.idl

dlls/propsys/Makefile.in

@@ -4,9 +4,8 @@ IMPORTS   = ole32 oleaut32 uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	propstore.c \
+	propsys_classes.idl \
 	propsys_main.c \
 	propvar.c
-
-IDL_SRCS = propsys_classes.idl

dlls/pstorec/Makefile.in

@@ -3,7 +3,6 @@ IMPORTS   = uuid
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
-	pstorec.c
-
-IDL_SRCS = pstorec_tlb.idl
+SOURCES = \
+	pstorec.c \
+	pstorec_tlb.idl