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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 92fe7c9c9f218dda519f0d2952440627c61bdcdb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/92fe7c9c9f218dda519f0d295244062...

Author: Alexandre Julliard 
Date:   Thu Oct 12 10:55:01 2023 +0200

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

---

dlls/winemac.drv/Makefile.in | 27 ++++++++++++---------------
 tools/make_makefiles         |  3 +--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in
index 41b2234c39a..e3e71c5f4cc 100644
--- a/dlls/winemac.drv/Makefile.in
+++ b/dlls/winemac.drv/Makefile.in
@@ -14,8 +14,17 @@ UNIX_LIBS    = \
    -framework Security \
    $(METAL_LIBS)

-C_SRCS = \
+SOURCES = \
    clipboard.c \
+	cocoa_app.m \
+	cocoa_clipboard.m \
+	cocoa_cursorclipping.m \
+	cocoa_display.m \
+	cocoa_event.m \
+	cocoa_main.m \
+	cocoa_opengl.m \
+	cocoa_status_item.m \
+	cocoa_window.m \
    display.c \
    dllmain.c \
    dragdrop.c \
@@ -29,17 +38,5 @@ C_SRCS = \
    surface.c \
    systray.c \
    vulkan.c \
-	window.c
-
-OBJC_SRCS = \
-	cocoa_app.m \
-	cocoa_clipboard.m \
-	cocoa_cursorclipping.m \
-	cocoa_display.m \
-	cocoa_event.m \
-	cocoa_main.m \
-	cocoa_opengl.m \
-	cocoa_status_item.m \
-	cocoa_window.m
-
-RC_SRCS = winemac.rc
+	window.c \
+	winemac.rc
diff --git a/tools/make_makefiles b/tools/make_makefiles
index eebb02da691..5b263c58d24 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 =~ /.(mc|po)$/)
+        if ($name =~ /.(m|mc|po)$/)
         {
             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; }