Module: wine Branch: master Commit: 64de93e3001967a2c7a92de1b9ae42730f3c3f82 URL: https://gitlab.winehq.org/wine/wine/-/commit/64de93e3001967a2c7a92de1b9ae427...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 12 10:50:42 2023 +0200
makefiles: Always use the global SOURCES variable for .mc files.
---
dlls/kernelbase/Makefile.in | 9 ++++----- dlls/mferror/Makefile.in | 2 +- dlls/wininet/Makefile.in | 9 +++------ programs/fsutil/Makefile.in | 6 ++---- tools/make_makefiles | 12 +++++++----- 5 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 1f10fe8cc0b..081e9bfbb64 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -7,10 +7,11 @@ EXTRADLLFLAGS = -nodefaultlibs -nostartfiles i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b000000 x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x174000000
-C_SRCS = \ +SOURCES = \ console.c \ debug.c \ file.c \ + kernelbase.rc \ loader.c \ locale.c \ main.c \ @@ -23,7 +24,5 @@ C_SRCS = \ sync.c \ thread.c \ version.c \ - volume.c - -RC_SRCS = kernelbase.rc -MC_SRCS = winerror.mc + volume.c \ + winerror.mc diff --git a/dlls/mferror/Makefile.in b/dlls/mferror/Makefile.in index 271688a79a5..5ee1b74184b 100644 --- a/dlls/mferror/Makefile.in +++ b/dlls/mferror/Makefile.in @@ -2,4 +2,4 @@ MODULE = mferror.dll
EXTRADLLFLAGS = -Wb,--data-only
-MC_SRCS = mferror.mc +SOURCES = mferror.mc diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 5fbb66be50e..57db3794e36 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -5,7 +5,7 @@ IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 EXTRAINCL = $(ZLIB_PE_CFLAGS) DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi
-C_SRCS = \ +SOURCES = \ cookie.c \ dialogs.c \ ftp.c \ @@ -14,9 +14,6 @@ C_SRCS = \ internet.c \ netconnection.c \ urlcache.c \ - utility.c - -RC_SRCS = wininet.rc - -MC_SRCS = \ + utility.c \ + wininet.rc \ winineterror.mc diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index df1c8ac6657..55850d2a92b 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -3,8 +3,6 @@ IMPORTS = user32
EXTRADLLFLAGS = -mconsole -municode
-C_SRCS = \ +SOURCES = \ + fsutil.mc \ main.c - -MC_SRCS = \ - fsutil.mc diff --git a/tools/make_makefiles b/tools/make_makefiles index 3cb272c5c06..82446973f25 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,7 +338,12 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 );
- if ($name =~ /.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } + if ($name =~ /.mc$/) + { + push @{${$make}{"=SOURCES"}}, $name; + next; + } + elsif ($name =~ /.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } @@ -358,10 +363,6 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=RC_SRCS"}}, $name; } - elsif ($name =~ /.mc$/) - { - push @{${$make}{"=MC_SRCS"}}, $name; - } elsif ($name =~ /.po$/) { push @{${$make}{"=PO_SRCS"}}, $name; @@ -408,6 +409,7 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{$file}; my $parent = get_parent_makefile( $file ); next unless $parent; + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "SOURCES" ); 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" );