From 94771cf07ad41b0f7d792559771222855ac01ba6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 14 Oct 2023 13:50:44 +0200 Subject: [PATCH] makefiles: Always use the global SOURCES variable for .l files. --- dlls/d3dcompiler_33/Makefile.in | 15 +++++---------- dlls/d3dcompiler_34/Makefile.in | 15 +++++---------- dlls/d3dcompiler_35/Makefile.in | 15 +++++---------- dlls/d3dcompiler_36/Makefile.in | 15 +++++---------- dlls/d3dcompiler_37/Makefile.in | 15 +++++---------- dlls/d3dcompiler_38/Makefile.in | 15 +++++---------- dlls/d3dcompiler_39/Makefile.in | 15 +++++---------- dlls/d3dcompiler_40/Makefile.in | 15 +++++---------- dlls/d3dcompiler_41/Makefile.in | 15 +++++---------- dlls/d3dcompiler_42/Makefile.in | 15 +++++---------- dlls/d3dcompiler_43/Makefile.in | 15 +++++---------- dlls/d3dcompiler_46/Makefile.in | 15 +++++---------- dlls/d3dcompiler_47/Makefile.in | 15 +++++---------- dlls/msxml3/Makefile.in | 22 ++++++++-------------- tools/make_makefiles | 4 +--- 15 files changed, 74 insertions(+), 147 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c9aff6e7edd..5bc3b44e879 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9d8f48e48ee..e31d74fd902 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 1da7eca6c01..49be82f2593 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 62be7b22281..30f3e183396 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index e8759d9e577..072e27a86d2 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index da528cc0509..a03cdd730c8 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 94ec5aae839..2f9231871f1 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 10665d863ca..f6451bcad53 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 5d522857173..433a2cb03a3 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 613ddee223e..9f4f571b5bd 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d02280305e8..51993fd0d79 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 1d82dfed1d9..1466c060ebf 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -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 diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index e7df065061c..a98ca7243c1 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -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 diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..7e59a223143 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -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 diff --git a/tools/make_makefiles b/tools/make_makefiles index 1e52ee1cf67..bd84414d9c5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -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" ); } } -- 2.11.4.GIT