makefiles: Generate the testclean rule using the subdirs file lists.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fcc0e76215
commit
3e6c12e7a9
|
@ -542,9 +542,7 @@ programs/winetest: $ac_dir
|
||||||
check test: $ac_dir/test
|
check test: $ac_dir/test
|
||||||
.PHONY: $ac_dir/test
|
.PHONY: $ac_dir/test
|
||||||
$ac_dir/test: dummy
|
$ac_dir/test: dummy
|
||||||
@cd $ac_dir && \$(MAKE) test
|
@cd $ac_dir && \$(MAKE) test"
|
||||||
testclean::
|
|
||||||
\$(RM) $ac_dir/*.ok"
|
|
||||||
|
|
||||||
if test -n "$CROSSTARGET"
|
if test -n "$CROSSTARGET"
|
||||||
then
|
then
|
||||||
|
|
|
@ -8037,9 +8037,7 @@ programs/winetest: $ac_dir
|
||||||
check test: $ac_dir/test
|
check test: $ac_dir/test
|
||||||
.PHONY: $ac_dir/test
|
.PHONY: $ac_dir/test
|
||||||
$ac_dir/test: dummy
|
$ac_dir/test: dummy
|
||||||
@cd $ac_dir && \$(MAKE) test
|
@cd $ac_dir && \$(MAKE) test"
|
||||||
testclean::
|
|
||||||
\$(RM) $ac_dir/*.ok"
|
|
||||||
|
|
||||||
if test -n "$CROSSTARGET"
|
if test -n "$CROSSTARGET"
|
||||||
then
|
then
|
||||||
|
|
|
@ -3326,8 +3326,9 @@ static void output_subdirs( struct makefile *make )
|
||||||
{
|
{
|
||||||
struct strarray build_deps = empty_strarray;
|
struct strarray build_deps = empty_strarray;
|
||||||
struct strarray makefile_deps = empty_strarray;
|
struct strarray makefile_deps = empty_strarray;
|
||||||
|
struct strarray testclean_files = empty_strarray;
|
||||||
struct strarray distclean_files = get_expanded_make_var_array( make, "CONFIGURE_TARGETS" );
|
struct strarray distclean_files = get_expanded_make_var_array( make, "CONFIGURE_TARGETS" );
|
||||||
unsigned int i;
|
unsigned int i, j;
|
||||||
|
|
||||||
strarray_add( &distclean_files, obj_dir_path( make, output_makefile_name ));
|
strarray_add( &distclean_files, obj_dir_path( make, output_makefile_name ));
|
||||||
if (!make->src_dir) strarray_add( &distclean_files, obj_dir_path( make, ".gitignore" ));
|
if (!make->src_dir) strarray_add( &distclean_files, obj_dir_path( make, ".gitignore" ));
|
||||||
|
@ -3339,7 +3340,12 @@ static void output_subdirs( struct makefile *make )
|
||||||
strmake ( "%s.in", output_makefile_name ))));
|
strmake ( "%s.in", output_makefile_name ))));
|
||||||
strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name ));
|
strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name ));
|
||||||
if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" ));
|
if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" ));
|
||||||
if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" ));
|
if (submake->testdll)
|
||||||
|
{
|
||||||
|
for (j = 0; j < submake->ok_files.count; j++)
|
||||||
|
strarray_add( &testclean_files, base_dir_path( submake, submake->ok_files.str[j] ));
|
||||||
|
strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" ));
|
||||||
|
}
|
||||||
strarray_addall( &build_deps, output_importlib_symlinks( make, submake ));
|
strarray_addall( &build_deps, output_importlib_symlinks( make, submake ));
|
||||||
}
|
}
|
||||||
output( "Makefile:" );
|
output( "Makefile:" );
|
||||||
|
@ -3347,9 +3353,12 @@ static void output_subdirs( struct makefile *make )
|
||||||
output( "\n" );
|
output( "\n" );
|
||||||
output_filenames( makefile_deps );
|
output_filenames( makefile_deps );
|
||||||
output( ":\n" );
|
output( ":\n" );
|
||||||
|
output( "testclean::\n");
|
||||||
|
output_rm_filenames( testclean_files );
|
||||||
output( "distclean::\n");
|
output( "distclean::\n");
|
||||||
output_rm_filenames( distclean_files );
|
output_rm_filenames( distclean_files );
|
||||||
strarray_add( &make->phony_targets, "distclean" );
|
strarray_add( &make->phony_targets, "distclean" );
|
||||||
|
strarray_add( &make->phony_targets, "testclean" );
|
||||||
|
|
||||||
if (build_deps.count)
|
if (build_deps.count)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue