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

dlls/appwiz.cpl/Makefile.in

@@ -2,13 +2,10 @@ MODULE    = appwiz.cpl
 IMPORTS   = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase
 DELAYIMPORTS = msi
 
-C_SRCS = \
+SOURCES = \
 	addons.c \
-	appwiz.c
-
-RC_SRCS = appwiz.rc
-
-SVG_SRCS = \
+	appwiz.c \
+	appwiz.rc \
 	appwiz.svg
 
 addons_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""

dlls/comctl32/Makefile.in

@@ -4,11 +4,12 @@ IMPORTLIB = comctl32
 IMPORTS   = uuid user32 gdi32 advapi32 imm32 kernelbase
 DELAYIMPORTS = winmm uxtheme
 
-C_SRCS = \
+SOURCES = \
 	animate.c \
 	button.c \
 	combo.c \
 	comboex.c \
+	comctl32.rc \
 	commctrl.c \
 	datetime.c \
 	dpa.c \
@@ -18,6 +19,16 @@ C_SRCS = \
 	flatsb.c \
 	header.c \
 	hotkey.c \
+	idb_hist_large.svg \
+	idb_hist_small.svg \
+	idb_std_large.svg \
+	idb_std_small.svg \
+	idb_view_large.svg \
+	idb_view_small.svg \
+	idc_copy.svg \
+	idc_divider.svg \
+	idc_divideropen.svg \
+	idc_movebutton.svg \
 	imagelist.c \
 	ipaddress.c \
 	listbox.c \
@@ -40,17 +51,3 @@ C_SRCS = \
 	trackbar.c \
 	treeview.c \
 	updown.c
-
-RC_SRCS = comctl32.rc
-
-SVG_SRCS = \
-	idb_hist_large.svg \
-	idb_hist_small.svg \
-	idb_std_large.svg \
-	idb_std_small.svg \
-	idb_view_large.svg \
-	idb_view_small.svg \
-	idc_copy.svg \
-	idc_divider.svg \
-	idc_divideropen.svg \
-	idc_movebutton.svg

dlls/comdlg32/Makefile.in

@@ -4,23 +4,19 @@ IMPORTLIB = comdlg32
 IMPORTS   = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32
 DELAYIMPORTS = ole32
 
-C_SRCS = \
+SOURCES = \
 	cdlg32.c \
 	colordlg.c \
+	comdlg32.rc \
+	comdlg32_classes.idl \
 	filedlg.c \
 	filedlg31.c \
 	filedlgbrowser.c \
 	finddlg.c \
 	fontdlg.c \
 	itemdlg.c \
-	printdlg.c
-
-RC_SRCS = comdlg32.rc
-
-SVG_SRCS = \
 	pd32_collate.svg \
 	pd32_landscape.svg \
 	pd32_nocollate.svg \
-	pd32_portrait.svg
-
-IDL_SRCS = comdlg32_classes.idl
+	pd32_portrait.svg \
+	printdlg.c

dlls/credui/Makefile.in

@@ -4,10 +4,7 @@ IMPORTS   = comctl32 user32 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
+	banner.svg \
+	credui.rc \
 	credui_main.c
-
-RC_SRCS = credui.rc
-
-SVG_SRCS = \
-	banner.svg

dlls/hhctrl.ocx/Makefile.in

@@ -2,20 +2,16 @@ MODULE    = hhctrl.ocx
 IMPORTLIB = htmlhelp
 IMPORTS   = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	chm.c \
 	content.c \
 	help.c \
 	hhctrl.c \
+	hhctrl.rc \
+	hhctrl_tlb.idl \
+	hhtoolbar.svg \
+	hhtreeview.svg \
 	index.c \
 	search.c \
 	stream.c \
 	webbrowser.c
-
-IDL_SRCS = hhctrl_tlb.idl
-
-RC_SRCS = hhctrl.rc
-
-SVG_SRCS = \
-	hhtoolbar.svg \
-	hhtreeview.svg

dlls/ieframe/Makefile.in

@@ -2,15 +2,18 @@ MODULE    = ieframe.dll
 IMPORTLIB = ieframe
 IMPORTS   = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	classinfo.c \
 	client.c \
 	dochost.c \
 	events.c \
 	frame.c \
 	ie.c \
+	ieframe.rc \
 	ieframe_main.c \
+	ieframe_v1.idl \
 	iehtmlwnd.c \
+	ietoolbar.svg \
 	iexplore.c \
 	intshcut.c \
 	navigate.c \
@@ -21,10 +24,3 @@ C_SRCS = \
 	urlhist.c \
 	view.c \
 	webbrowser.c
-
-RC_SRCS = ieframe.rc
-
-SVG_SRCS = \
-	ietoolbar.svg
-
-IDL_SRCS = ieframe_v1.idl

dlls/inetcpl.cpl/Makefile.in

@@ -4,14 +4,11 @@ DELAYIMPORTS = cryptui wininet ole32 urlmon shell32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	connections.c \
 	content.c \
 	general.c \
 	inetcpl.c \
+	inetcpl.rc \
+	inetcpl.svg \
 	security.c
-
-RC_SRCS = inetcpl.rc
-
-SVG_SRCS = \
-	inetcpl.svg

dlls/joy.cpl/Makefile.in

@@ -3,12 +3,9 @@ IMPORTS   = dxguid dinput dinput8 ole32 comctl32 user32 gdi32 advapi32 xinput
 
 EXTRADLLFLAGS = -Wb,--prefer-native
 
-C_SRCS = \
+SOURCES = \
 	dinput.c \
+	joy.rc \
+	joy.svg \
 	main.c \
 	xinput.c
-
-RC_SRCS = joy.rc
-
-SVG_SRCS = \
-	joy.svg

dlls/light.msstyles/Makefile.in

@@ -2,9 +2,7 @@ MODULE = light.msstyles
 
 EXTRADLLFLAGS = -Wb,--data-only
 
-RC_SRCS = light.rc
-
-SVG_SRCS = \
+SOURCES = \
 	blue_button.svg \
 	blue_checkbox_13px.svg \
 	blue_checkbox_16px.svg \
@@ -482,4 +480,5 @@ SVG_SRCS = \
 	blue_window_small_close_button_glyph.svg \
 	blue_window_small_frame_bottom.svg \
 	blue_window_small_frame_left.svg \
-	blue_window_small_frame_right.svg
+	blue_window_small_frame_right.svg \
+	light.rc

dlls/ole32/Makefile.in

@@ -4,7 +4,7 @@ IMPORTLIB = ole32
 IMPORTS   = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase
 DELAYIMPORTS = oleaut32
 
-C_SRCS = \
+SOURCES = \
 	antimoniker.c \
 	bindctx.c \
 	classmoniker.c \
@@ -13,19 +13,29 @@ C_SRCS = \
 	compobj.c \
 	compositemoniker.c \
 	datacache.c \
+	dcom.idl \
 	defaulthandler.c \
 	dictionary.c \
+	drag_copy.svg \
+	drag_link.svg \
+	drag_move.svg \
 	filelockbytes.c \
 	filemoniker.c \
 	ftmarshal.c \
 	git.c \
+	irot.idl \
 	itemmoniker.c \
 	marshal.c \
 	memlockbytes.c \
 	moniker.c \
+	nodrop.svg \
 	ole2.c \
 	ole2stubs.c \
 	ole32_main.c \
+	ole32_objidl.idl \
+	ole32_oleidl.idl \
+	ole32_unknwn.idl \
+	ole32res.rc \
 	oleobj.c \
 	oleproxy.c \
 	pointermoniker.c \
@@ -33,20 +43,4 @@ C_SRCS = \
 	stg_stream.c \
 	storage32.c \
 	usrmarshal.c
-
-RC_SRCS = ole32res.rc
-
-IDL_SRCS = \
-	dcom.idl \
-	irot.idl \
-	ole32_objidl.idl \
-	ole32_oleidl.idl \
-	ole32_unknwn.idl
-
 dlldata_EXTRADEFS = -DENTRY_PREFIX=OLE32_ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL
-
-SVG_SRCS = \
-	drag_copy.svg \
-	drag_link.svg \
-	drag_move.svg \
-	nodrop.svg

dlls/riched20/Makefile.in

@@ -4,15 +4,17 @@ IMPORTS   = uuid ole32 oleaut32 imm32 user32 gdi32
 
 EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000
 
-C_SRCS = \
+SOURCES = \
 	caret.c \
 	clipboard.c \
 	context.c \
 	editor.c \
 	list.c \
+	ocr_reverse.svg \
 	paint.c \
 	para.c \
 	reader.c \
+	riched_tom.idl \
 	richole.c \
 	row.c \
 	run.c \
@@ -22,13 +24,6 @@ C_SRCS = \
 	txthost.c \
 	txtsrv.c \
 	undo.c \
+	version.rc \
 	wrap.c \
 	writer.c
-
-RC_SRCS = version.rc
-
-IDL_SRCS = \
-	riched_tom.idl
-
-SVG_SRCS = \
-	ocr_reverse.svg

dlls/shell32/Makefile.in

@@ -4,7 +4,7 @@ IMPORTLIB = shell32
 IMPORTS   = uuid shlwapi user32 gdi32 advapi32
 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 comdlg32 gdiplus
 
-C_SRCS = \
+SOURCES = \
 	appbar.c \
 	assoc.c \
 	autocomplete.c \
@@ -25,37 +25,6 @@ C_SRCS = \
 	iconcache.c \
 	pidl.c \
 	recyclebin.c \
-	shell32_main.c \
-	shelldispatch.c \
-	shellitem.c \
-	shelllink.c \
-	shellole.c \
-	shellord.c \
-	shellpath.c \
-	shellreg.c \
-	shellstring.c \
-	shfldr_desktop.c \
-	shfldr_fs.c \
-	shfldr_mycomp.c \
-	shfldr_netplaces.c \
-	shfldr_printers.c \
-	shlexec.c \
-	shlfileop.c \
-	shlfolder.c \
-	shlfsbind.c \
-	shlmenu.c \
-	shlview.c \
-	shlview_cmenu.c \
-	shpolicy.c \
-	systray.c
-
-RC_SRCS = shell32.rc
-
-IDL_SRCS = \
-	shell32_classes.idl \
-	shell32_tlb.idl
-
-SVG_SRCS = \
 	resources/audio.svg \
 	resources/blank.svg \
 	resources/control.svg \
@@ -98,4 +67,30 @@ SVG_SRCS = \
 	resources/update.svg \
 	resources/users.svg \
 	resources/video.svg \
-	resources/window.svg
+	resources/window.svg \
+	shell32.rc \
+	shell32_classes.idl \
+	shell32_main.c \
+	shell32_tlb.idl \
+	shelldispatch.c \
+	shellitem.c \
+	shelllink.c \
+	shellole.c \
+	shellord.c \
+	shellpath.c \
+	shellreg.c \
+	shellstring.c \
+	shfldr_desktop.c \
+	shfldr_fs.c \
+	shfldr_mycomp.c \
+	shfldr_netplaces.c \
+	shfldr_printers.c \
+	shlexec.c \
+	shlfileop.c \
+	shlfolder.c \
+	shlfsbind.c \
+	shlmenu.c \
+	shlview.c \
+	shlview_cmenu.c \
+	shpolicy.c \
+	systray.c

dlls/user32/Makefile.in

@@ -5,7 +5,7 @@ IMPORTS   = $(PNG_PE_LIBS) gdi32 sechost advapi32 kernelbase win32u
 EXTRAINCL = $(PNG_PE_CFLAGS)
 DELAYIMPORTS = imm32
 
-C_SRCS = \
+SOURCES = \
 	button.c \
 	class.c \
 	clipboard.c \
@@ -33,21 +33,6 @@ C_SRCS = \
 	nonclient.c \
 	property.c \
 	resource.c \
-	scroll.c \
-	static.c \
-	sysparams.c \
-	text.c \
-	uitools.c \
-	user_main.c \
-	win.c \
-	winhelp.c \
-	winproc.c \
-	winstation.c \
-	wsprintf.c
-
-RC_SRCS = user32.rc
-
-SVG_SRCS = \
 	resources/ocr_appstarting.svg \
 	resources/ocr_cross.svg \
 	resources/ocr_hand.svg \
@@ -70,4 +55,16 @@ SVG_SRCS = \
 	resources/oic_ques.svg \
 	resources/oic_sample.svg \
 	resources/oic_shield.svg \
-	resources/oic_winlogo.svg
+	resources/oic_winlogo.svg \
+	scroll.c \
+	static.c \
+	sysparams.c \
+	text.c \
+	uitools.c \
+	user32.rc \
+	user_main.c \
+	win.c \
+	winhelp.c \
+	winproc.c \
+	winstation.c \
+	wsprintf.c

programs/cmd/Makefile.in

@@ -3,12 +3,10 @@ IMPORTS   = shell32 user32 advapi32
 
 EXTRADLLFLAGS = -mconsole -municode
 
-C_SRCS = \
+SOURCES = \
 	batch.c \
 	builtins.c \
+	cmd.rc \
 	directory.c \
+	wcmd.svg \
 	wcmdmain.c
-
-RC_SRCS = cmd.rc
-
-SVG_SRCS = wcmd.svg

programs/hh/Makefile.in

@@ -2,9 +2,7 @@ MODULE    = hh.exe
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
-	main.c
-
-RC_SRCS = hh.rc
-
-SVG_SRCS = winhelp.svg
+SOURCES = \
+	hh.rc \
+	main.c \
+	winhelp.svg

programs/iexplore/Makefile.in

@@ -4,9 +4,7 @@ DELAYIMPORTS = advpack version user32
 
 EXTRADLLFLAGS = -mwindows -municode -Wl,--large-address-aware
 
-C_SRCS = \
+SOURCES = \
+	iexplore.rc \
+	iexplore.svg \
 	main.c
-
-RC_SRCS = iexplore.rc
-
-SVG_SRCS = iexplore.svg

programs/taskmgr/Makefile.in

@@ -3,7 +3,7 @@ IMPORTS   = shell32 shlwapi comctl32 user32 gdi32 advapi32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	about.c \
 	affinity.c \
 	applpage.c \
@@ -21,9 +21,6 @@ C_SRCS = \
 	procpage.c \
 	run.c \
 	taskmgr.c \
+	taskmgr.rc \
+	taskmgr.svg \
 	trayicon.c
-
-RC_SRCS = taskmgr.rc
-
-SVG_SRCS = \
-	taskmgr.svg

programs/winetest/Makefile.in

@@ -4,16 +4,13 @@ DELAYIMPORTS = ole32
 
 EXTRADLLFLAGS = -mconsole
 
-C_SRCS = \
+SOURCES = \
 	gui.c \
 	main.c \
 	send.c \
-	util.c
-
-RC_SRCS = \
-	winetest.rc
-
-SVG_SRCS = winetest.svg
+	util.c \
+	winetest.rc \
+	winetest.svg
 
 EXTRA_OBJS = build.res
 

programs/winhlp32/Makefile.in

@@ -4,15 +4,12 @@ DELAYIMPORTS = shell32 comctl32 comdlg32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
 	callback.c \
 	hlpfile.c \
 	macro.c \
+	macro.lex.l \
 	string.c \
-	winhelp.c
-
-LEX_SRCS = macro.lex.l
-
-RC_SRCS = winhlp32.rc
-
-SVG_SRCS = winhelp.svg
+	winhelp.c \
+	winhelp.svg \
+	winhlp32.rc

programs/wordpad/Makefile.in

@@ -3,16 +3,13 @@ IMPORTS   = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32
 
 EXTRADLLFLAGS = -mwindows
 
-C_SRCS = \
+SOURCES = \
+	formatbar.svg \
 	olecallback.c \
 	print.c \
 	registry.c \
-	wordpad.c
-
-RC_SRCS = wordpad.rc
-
-SVG_SRCS = \
-	formatbar.svg \
 	toolbar.svg \
+	wordpad.c \
+	wordpad.rc \
 	wordpad.svg \
 	zoom.svg

tools/make_makefiles

@@ -338,14 +338,13 @@ sub assign_sources_to_makefiles(@)
         my $make = $makefiles{"$dir/Makefile.in"};
         my $name = substr( $file, length($dir) + 1 );
 
-        if ($name =~ /\.(in|m|mc|po|sfd)$/)
+        if ($name =~ /\.(in|m|mc|po|sfd|svg)$/)
         {
             push @{${$make}{"=SOURCES"}}, $name;
             next;
         }
         elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
         elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
-        elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }
         elsif ($name =~ /\.c$/)
         {
             push @{${$make}{"=C_SRCS"}}, $name;