Module: wine Branch: master Commit: b6e502610a39f115a086533e5e93d5ba2a73a277 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6e502610a39f115a086533e5e93d5b...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 12 11:02:17 2023 +0200
makefiles: Always use the global SOURCES variable for .in files.
---
dlls/wineandroid.drv/Makefile.in | 11 +++-------- tools/Makefile.in | 6 ++---- tools/make_makefiles | 3 ++- 3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index abd893db71f..1eb209e92ff 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -3,18 +3,13 @@ UNIXLIB = wineandroid.so IMPORTS = ntoskrnl UNIX_LIBS = -lwin32u $(PTHREAD_LIBS)
-C_SRCS = \ +SOURCES = \ + build.gradle.in \ device.c \ dllmain.c \ init.c \ keyboard.c \ opengl.c \ - window.c - -IN_SRCS = \ - build.gradle.in - -SVG_SRCS = \ + window.c \ wine.svg - EXTRA_TARGETS = wine-debug.apk diff --git a/tools/Makefile.in b/tools/Makefile.in index adf53bb2c51..cd643e7e90b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,8 +1,6 @@ PROGRAMS = \ make_xftmpl
-C_SRCS = \ - make_xftmpl.c - -IN_SRCS = \ +SOURCES = \ + make_xftmpl.c \ wineapploader.in diff --git a/tools/make_makefiles b/tools/make_makefiles index 9e10220ad46..c114c30ed57 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -369,7 +369,8 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /.in$/) { - push @{${$make}{"=IN_SRCS"}}, $name; + push @{${$make}{"=SOURCES"}}, $name; + next; } elsif ($name =~ /.spec$/) {