Module: wine Branch: stable Commit: 3237a368a49e699bc68d0dd1e60b506b51362058 URL: https://gitlab.winehq.org/wine/wine/-/commit/3237a368a49e699bc68d0dd1e60b506... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 10:29:14 2022 +0200 makefiles: Add install-test target to install winetest.exe. Conflicts: tools/gitlab/build.yml (cherry picked from commit dbb55ed91aded087a6c0320a2f4ae7980200b1e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/Makefile.in | 2 +- tools/makedep.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c4d505e4545..f82ba5ec438 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -19,4 +19,4 @@ EXTRA_OBJS = build.res EXTRA_TARGETS = build.nfo -INSTALL_LIB = none +INSTALL_TEST = winetest.exe diff --git a/tools/makedep.c b/tools/makedep.c index 86f96f5c5e8..e10ccc7bfc2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -119,9 +119,9 @@ static const struct static struct list files[HASH_SIZE]; -enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES }; -static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev" }; -static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV" }; +enum install_rules { INSTALL_LIB, INSTALL_DEV, INSTALL_TEST, NB_INSTALL_RULES }; +static const char *install_targets[NB_INSTALL_RULES] = { "install-lib", "install-dev", "install-test" }; +static const char *install_variables[NB_INSTALL_RULES] = { "INSTALL_LIB", "INSTALL_DEV", "INSTALL_TEST" }; /* variables common to all makefiles */ static struct strarray linguas; @@ -3603,10 +3603,14 @@ static void output_subdirs( struct makefile *make ) for (j = 0; j < NB_INSTALL_RULES; j++) { if (!install_deps[j].count) continue; - output( "install %s::", install_targets[j] ); + if (strcmp( install_targets[j], "install-test" )) + { + output( "install " ); + strarray_add_uniq( &make->phony_targets, "install" ); + } + output( "%s::", install_targets[j] ); output_filenames( install_deps[j] ); output( "\n" ); - strarray_add_uniq( &make->phony_targets, "install" ); strarray_add_uniq( &make->phony_targets, install_targets[j] ); } output_uninstall_rules( make );