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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ffeb530cc0bd21016d1ea718de720edb3879d8d7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ffeb530cc0bd21016d1ea718de720ed...

Author: Alexandre Julliard 
Date:   Sat Oct 14 13:51:42 2023 +0200

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

---

dlls/jscript/Makefile.in  | 17 ++++++-----------
 dlls/msi/Makefile.in      | 17 ++++++-----------
 dlls/vbscript/Makefile.in | 13 ++++---------
 dlls/wbemprox/Makefile.in | 10 ++++------
 tools/make_makefiles      |  4 +---
 5 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in
index 3e019201eb8..c37b0dd69f3 100644
--- a/dlls/jscript/Makefile.in
+++ b/dlls/jscript/Makefile.in
@@ -1,10 +1,11 @@
 MODULE    = jscript.dll
 IMPORTS   = oleaut32 ole32 user32 advapi32

-C_SRCS = \
+SOURCES = \
    activex.c \
    array.c \
    bool.c \
+	cc_parser.y \
    compile.c \
    date.c \
    decode.c \
@@ -15,7 +16,10 @@ C_SRCS = \
    function.c \
    global.c \
    jscript.c \
+	jscript.rc \
+	jscript_classes.idl \
    jscript_main.c \
+	jsglobal.idl \
    json.c \
    jsregexp.c \
    jsstr.c \
@@ -24,17 +28,8 @@ C_SRCS = \
    math.c \
    number.c \
    object.c \
+	parser.y \
    regexp.c \
    set.c \
    string.c \
    vbarray.c
-
-RC_SRCS = jscript.rc
-
-IDL_SRCS = \
-	jscript_classes.idl \
-	jsglobal.idl
-
-BISON_SRCS = \
-	cc_parser.y \
-	parser.y
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 7140e5a3308..21420909a92 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -4,13 +4,14 @@ IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32

EXTRAIDLFLAGS = --prefix-server=s_

-C_SRCS = \
+SOURCES = \
    action.c \
    alter.c \
    appsearch.c \
    assembly.c \
    automation.c \
    classes.c \
+	cond.y \
    create.c \
    custom.c \
    database.c \
@@ -26,8 +27,10 @@ C_SRCS = \
    install.c \
    media.c \
    msi.c \
+	msi.rc \
    msi_main.c \
    msiquery.c \
+	msiserver.idl \
    package.c \
    patch.c \
    record.c \
@@ -35,6 +38,7 @@ C_SRCS = \
    script.c \
    select.c \
    source.c \
+	sql.y \
    storages.c \
    streams.c \
    string.c \
@@ -43,14 +47,5 @@ C_SRCS = \
    tokenize.c \
    update.c \
    upgrade.c \
-	where.c
-
-IDL_SRCS = \
-	msiserver.idl \
+	where.c \
    winemsi.idl
-
-BISON_SRCS = \
-	cond.y \
-	sql.y
-
-RC_SRCS = msi.rc
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in
index a6a0569cc03..0dcc928460b 100644
--- a/dlls/vbscript/Makefile.in
+++ b/dlls/vbscript/Makefile.in
@@ -3,25 +3,20 @@ IMPORTS   = oleaut32 ole32 user32

EXTRADLLFLAGS = -Wb,--prefer-native

-C_SRCS = \
+SOURCES = \
    compile.c \
    global.c \
    interp.c \
    lex.c \
+	parser.y \
    regexp.c \
    utils.c \
    vbdisp.c \
    vbregexp.c \
    vbscript.c \
-	vbscript_main.c
-
-BISON_SRCS = \
-	parser.y
-
-RC_SRCS = vbscript.rc
-
-IDL_SRCS = \
+	vbscript.rc \
    vbscript_classes.idl \
+	vbscript_main.c \
    vbsglobal.idl \
    vbsregexp10.idl \
    vbsregexp55.idl
diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index 48a43646491..53835c748ff 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = wbemprox.dll
 IMPORTS   = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi

-C_SRCS = \
+SOURCES = \
    builtin.c \
    class.c \
    main.c \
@@ -14,8 +14,6 @@ C_SRCS = \
    services.c \
    sysrestore.c \
    table.c \
-	wbemlocator.c
-
-IDL_SRCS = wbemprox.idl
-
-BISON_SRCS = wql.y
+	wbemlocator.c \
+	wbemprox.idl \
+	wql.y
diff --git a/tools/make_makefiles b/tools/make_makefiles
index bd84414d9c5..0e4a31648c3 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|l|m|mc|po|sfd|svg)$/)
+        if ($name =~ /.(in|l|m|mc|po|sfd|svg|y)$/)
         {
             push @{${$make}{"=SOURCES"}}, $name;
             next;
         }
-        elsif ($name =~ /.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
         elsif ($name =~ /.c$/)
         {
             push @{${$make}{"=C_SRCS"}}, $name;
@@ -394,7 +393,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}, "BISON_SRCS" );
     }
 }