Commit c047bb6e authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent 92fe7c9c
TESTDLL = dwrite.dll TESTDLL = dwrite.dll
IMPORTS = dwrite gdi32 user32 IMPORTS = dwrite gdi32 user32
C_SRCS = \ SOURCES = \
analyzer.c \ analyzer.c \
font.c \ font.c \
layout.c layout.c \
resource.rc \
FONT_SRCS = \
wine_test.sfd wine_test.sfd
RC_SRCS = resource.rc
TESTDLL = gdi32.dll TESTDLL = gdi32.dll
IMPORTS = setupapi user32 gdi32 advapi32 IMPORTS = setupapi user32 gdi32 advapi32
C_SRCS = \ SOURCES = \
bitmap.c \ bitmap.c \
brush.c \ brush.c \
clipping.c \ clipping.c \
...@@ -16,9 +16,8 @@ C_SRCS = \ ...@@ -16,9 +16,8 @@ C_SRCS = \
metafile.c \ metafile.c \
palette.c \ palette.c \
path.c \ path.c \
pen.c pen.c \
resource.rc \
FONT_SRCS = \
vertical.sfd \ vertical.sfd \
wine_langnames.sfd \ wine_langnames.sfd \
wine_langnames2.sfd \ wine_langnames2.sfd \
...@@ -29,5 +28,3 @@ FONT_SRCS = \ ...@@ -29,5 +28,3 @@ FONT_SRCS = \
wine_ttfnames.sfd \ wine_ttfnames.sfd \
wine_ttfnames_bold.sfd \ wine_ttfnames_bold.sfd \
wine_vdmx.sfd wine_vdmx.sfd
RC_SRCS = resource.rc
TESTDLL = gdiplus.dll TESTDLL = gdiplus.dll
IMPORTS = gdiplus ole32 user32 gdi32 IMPORTS = gdiplus ole32 user32 gdi32
C_SRCS = \ SOURCES = \
brush.c \ brush.c \
customlinecap.c \ customlinecap.c \
font.c \ font.c \
...@@ -13,10 +13,7 @@ C_SRCS = \ ...@@ -13,10 +13,7 @@ C_SRCS = \
pathiterator.c \ pathiterator.c \
pen.c \ pen.c \
region.c \ region.c \
stringformat.c resource.rc \
stringformat.c \
RC_SRCS = resource.rc
FONT_SRCS = \
wine_longname.sfd \ wine_longname.sfd \
wine_testfont0.sfd wine_testfont0.sfd
FONT_SRCS = \ SOURCES = \
courier.sfd \ courier.sfd \
fixedsys.sfd \ fixedsys.sfd \
fixedsys_jp.sfd \ fixedsys_jp.sfd \
......
...@@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@) ...@@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@)
my $make = $makefiles{"$dir/Makefile.in"}; my $make = $makefiles{"$dir/Makefile.in"};
my $name = substr( $file, length($dir) + 1 ); my $name = substr( $file, length($dir) + 1 );
if ($name =~ /\.(m|mc|po)$/) if ($name =~ /\.(m|mc|po|sfd)$/)
{ {
push @{${$make}{"=SOURCES"}}, $name; push @{${$make}{"=SOURCES"}}, $name;
next; next;
...@@ -346,10 +346,6 @@ sub assign_sources_to_makefiles(@) ...@@ -346,10 +346,6 @@ sub assign_sources_to_makefiles(@)
elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }
elsif ($name =~ /\.sfd$/)
{
push @{${$make}{"=FONT_SRCS"}}, $name;
}
elsif ($name =~ /\.c$/) elsif ($name =~ /\.c$/)
{ {
push @{${$make}{"=C_SRCS"}}, $name; push @{${$make}{"=C_SRCS"}}, $name;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment