marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Generate the crosstest disabled rule from makedep. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Alexandre Julliard 2018-03-04 15:33:02 +01:00
parent 84ddddfffb
commit 2fa7ae05f2
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -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"

4
configure.ac
View File

@ -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)

14
tools/makedep.c
View File

@ -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");