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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c047bb6ea3236705b6f21daedf45fe6a6467fd31
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c047bb6ea3236705b6f21daedf45fe6...

Author: Alexandre Julliard 
Date:   Thu Oct 12 10:58:53 2023 +0200

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

---

dlls/dwrite/tests/Makefile.in  | 9 +++------
 dlls/gdi32/tests/Makefile.in   | 9 +++------
 dlls/gdiplus/tests/Makefile.in | 9 +++------
 fonts/Makefile.in              | 2 +-
 tools/make_makefiles           | 6 +-----
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in
index 7fbf9e36c7e..789f12dd10b 100644
--- a/dlls/dwrite/tests/Makefile.in
+++ b/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
diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in
index 3eb478ff765..d6f33ee087d 100644
--- a/dlls/gdi32/tests/Makefile.in
+++ b/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
diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index ef3f26d9082..60587a2aabe 100644
--- a/dlls/gdiplus/tests/Makefile.in
+++ b/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
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index b8021851987..a582d7be864 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -1,4 +1,4 @@
-FONT_SRCS = \
+SOURCES = \
    courier.sfd \
    fixedsys.sfd \
    fixedsys_jp.sfd \
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 5b263c58d24..9e10220ad46 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -338,7 +338,7 @@ 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;
@@ -346,10 +346,6 @@ sub assign_sources_to_makefiles(@)
         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;