1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00

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

This commit is contained in:
Alexandre Julliard 2023-10-14 13:50:44 +02:00
parent 2205218b24
commit 94771cf07a
15 changed files with 74 additions and 147 deletions
dlls
d3dcompiler_33
d3dcompiler_34
d3dcompiler_35
d3dcompiler_36
d3dcompiler_37
d3dcompiler_38
d3dcompiler_39
d3dcompiler_40
d3dcompiler_41
d3dcompiler_42
d3dcompiler_43
d3dcompiler_46
d3dcompiler_47
msxml3
tools

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \
SOURCES = \
asmparser.c \
asmshader.l \
asmshader.y \
blob.c \
bytecodewriter.c \
compiler.c \
reflection.c \
utils.c
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
utils.c \
version.rc

View file

@ -2,7 +2,7 @@ MODULE = msxml3.dll
IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)
C_SRCS = \
SOURCES = \
attribute.c \
bsc.c \
cdata.c \
@ -17,6 +17,7 @@ C_SRCS = \
factory.c \
httprequest.c \
main.c \
msxml3_v1.idl \
mxnamespace.c \
mxwriter.c \
node.c \
@ -26,24 +27,17 @@ C_SRCS = \
pi.c \
saxreader.c \
schema.c \
schemas.rc \
selection.c \
stylesheet.c \
text.c \
uuid.c \
version.rc \
xdr.c \
xmldoc.c \
xmlelem.c \
xmlparser.c \
xmlview.c
LEX_SRCS = xslpattern.l
BISON_SRCS = xslpattern.y
RC_SRCS = \
schemas.rc \
version.rc
IDL_SRCS = \
msxml3_v1.idl \
xmlparser.idl
xmlparser.idl \
xmlview.c \
xslpattern.l \
xslpattern.y

View file

@ -338,12 +338,11 @@ 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|svg)$/)
if ($name =~ /\.(in|l|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 =~ /\.c$/)
{
@ -395,7 +394,6 @@ sub assign_sources_to_makefiles(@)
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" );
}
}