Skip to content

W
wine-winehq
Commit 94771cf0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

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

parent 2205218b
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 147 deletions
dlls/d3dcompiler_33/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_34/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_35/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_36/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_37/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_38/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_39/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_40/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_41/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_42/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_43/Makefile.in
View file @ 94771cf0
...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_46/Makefile.in
View file @ 94771cf0
...@@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/d3dcompiler_47/Makefile.in
View file @ 94771cf0
...@@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) ...@@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS)
EXTRADLLFLAGS = -Wb,--prefer-native EXTRADLLFLAGS = -Wb,--prefer-native
C_SRCS = \ SOURCES = \
asmparser.c \ asmparser.c \
asmshader.l \
asmshader.y \
blob.c \ blob.c \
bytecodewriter.c \ bytecodewriter.c \
compiler.c \ compiler.c \
reflection.c \ reflection.c \
utils.c utils.c \
version.rc
LEX_SRCS = \
asmshader.l
BISON_SRCS = \
asmshader.y
RC_SRCS = version.rc
dlls/msxml3/Makefile.in
View file @ 94771cf0
...@@ -2,7 +2,7 @@ MODULE = msxml3.dll ...@@ -2,7 +2,7 @@ MODULE = msxml3.dll
IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)
C_SRCS = \ SOURCES = \
attribute.c \ attribute.c \
bsc.c \ bsc.c \
cdata.c \ cdata.c \
...@@ -17,6 +17,7 @@ C_SRCS = \ ...@@ -17,6 +17,7 @@ C_SRCS = \
factory.c \ factory.c \
httprequest.c \ httprequest.c \
main.c \ main.c \
msxml3_v1.idl \
mxnamespace.c \ mxnamespace.c \
mxwriter.c \ mxwriter.c \
node.c \ node.c \
...@@ -26,24 +27,17 @@ C_SRCS = \ ...@@ -26,24 +27,17 @@ C_SRCS = \
pi.c \ pi.c \
saxreader.c \ saxreader.c \
schema.c \ schema.c \
schemas.rc \
selection.c \ selection.c \
stylesheet.c \ stylesheet.c \
text.c \ text.c \
uuid.c \ uuid.c \
version.rc \
xdr.c \ xdr.c \
xmldoc.c \ xmldoc.c \
xmlelem.c \ xmlelem.c \
xmlparser.c \ xmlparser.c \
xmlview.c xmlparser.idl \
xmlview.c \
LEX_SRCS = xslpattern.l xslpattern.l \
xslpattern.y
BISON_SRCS = xslpattern.y
RC_SRCS = \
schemas.rc \
version.rc
IDL_SRCS = \
msxml3_v1.idl \
xmlparser.idl
tools/make_makefiles
View file @ 94771cf0
...@@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) ...@@ -338,12 +338,11 @@ 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 =~ /\.(in|m|mc|po|sfd|svg)$/) if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/)
{ {
push @{${$make}{"=SOURCES"}}, $name; push @{${$make}{"=SOURCES"}}, $name;
next; next;
} }
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 =~ /\.c$/) elsif ($name =~ /\.c$/)
{ {
...@@ -395,7 +394,6 @@ sub assign_sources_to_makefiles(@) ...@@ -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}, "C_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_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}, "IDL_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" );
preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" );
} }
} }
......
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