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

Author: julliard

dlls/dwrite/tests/Makefile.in

@@ -1,12 +1,9 @@
 TESTDLL = dwrite.dll
 IMPORTS = dwrite gdi32 user32
 
-C_SRCS = \
+SOURCES = \
 	analyzer.c \
 	font.c \
-	layout.c
-
-FONT_SRCS = \
+	layout.c \
+	resource.rc \
 	wine_test.sfd
-
-RC_SRCS = resource.rc

dlls/gdi32/tests/Makefile.in

@@ -1,7 +1,7 @@
 TESTDLL   = gdi32.dll
 IMPORTS   = setupapi user32 gdi32 advapi32
 
-C_SRCS = \
+SOURCES = \
 	bitmap.c \
 	brush.c \
 	clipping.c \
@@ -16,9 +16,8 @@ C_SRCS = \
 	metafile.c \
 	palette.c \
 	path.c \
-	pen.c
-
-FONT_SRCS = \
+	pen.c \
+	resource.rc \
 	vertical.sfd \
 	wine_langnames.sfd \
 	wine_langnames2.sfd \
@@ -29,5 +28,3 @@ FONT_SRCS = \
 	wine_ttfnames.sfd \
 	wine_ttfnames_bold.sfd \
 	wine_vdmx.sfd
-
-RC_SRCS = resource.rc

dlls/gdiplus/tests/Makefile.in

@@ -1,7 +1,7 @@
 TESTDLL   = gdiplus.dll
 IMPORTS   = gdiplus ole32 user32 gdi32
 
-C_SRCS = \
+SOURCES = \
 	brush.c \
 	customlinecap.c \
 	font.c \
@@ -13,10 +13,7 @@ C_SRCS = \
 	pathiterator.c \
 	pen.c \
 	region.c \
-	stringformat.c
-
-RC_SRCS = resource.rc
-
-FONT_SRCS = \
+	resource.rc \
+	stringformat.c \
 	wine_longname.sfd \
 	wine_testfont0.sfd

fonts/Makefile.in

@@ -1,4 +1,4 @@
-FONT_SRCS = \
+SOURCES = \
 	courier.sfd \
 	fixedsys.sfd \
 	fixedsys_jp.sfd \

tools/make_makefiles

@@ -338,18 +338,14 @@ sub assign_sources_to_makefiles(@)
         my $make = $makefiles{"$dir/Makefile.in"};
         my $name = substr( $file, length($dir) + 1 );
 
-        if ($name =~ /\.(m|mc|po)$/)
+        if ($name =~ /\.(m|mc|po|sfd)$/)
         {
             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 =~ /\.sfd$/)
-        {
-            push @{${$make}{"=FONT_SRCS"}}, $name;
-        }
         elsif ($name =~ /\.c$/)
         {
             push @{${$make}{"=C_SRCS"}}, $name;