From 2fa7ae05f2378567f650e185079b657b89334858 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 4 Mar 2018 15:33:02 +0100 Subject: [PATCH] makefiles: Generate the crosstest disabled rule from makedep. Signed-off-by: Alexandre Julliard --- configure | 3 --- configure.ac | 4 ---- tools/makedep.c | 14 +++++++------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c9150d39c0c..cba521bcbfb 100755 --- a/configure +++ b/configure @@ -18198,9 +18198,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)" -test -n "$CROSSTARGET" || wine_fn_append_rule "crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" - if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" diff --git a/configure.ac b/configure.ac index 2e99320371d..5d09075481b 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,10 +2797,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -test -n "$CROSSTARGET" || WINE_APPEND_RULE( -[crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false]) - WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) diff --git a/tools/makedep.c b/tools/makedep.c index 457dcd0b72d..7e14ed4a773 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3547,13 +3547,13 @@ static void output_subdirs( struct makefile *make ) strarray_add( &make->phony_targets, "check" ); strarray_add( &make->phony_targets, "test" ); } - if (crosstest_deps.count) - { - output( "crosstest:" ); - output_filenames( crosstest_deps ); - output( "\n" ); - strarray_add( &make->phony_targets, "crosstest" ); - } + output( "crosstest:" ); + output_filenames( crosstest_deps ); + output( "\n" ); + if (!crosstest_deps.count) + output( "\t@echo \"crosstest is not supported (mingw not installed?)\" && false\n" ); + strarray_add( &make->phony_targets, "crosstest" ); + output( "clean::\n"); output_rm_filenames( clean_files ); output( "testclean::\n");