ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Generate makefile dependencies from makedep. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-01-11 21:02:28 +09:00
parent ba416a5781
commit cd0af88591
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aclocal.m4 vendored
View File

@ -231,8 +231,6 @@ wine_fn_has_flag ()
wine_fn_depend_rules () wine_fn_depend_rules ()
{ {
wine_fn_append_file SUBDIRS $ac_dir wine_fn_append_file SUBDIRS $ac_dir
wine_fn_append_rule \
"Makefile: $srcdir/$ac_dir/Makefile.in"
} }
wine_fn_pot_rules () wine_fn_pot_rules ()

2
configure vendored
View File

@ -7426,8 +7426,6 @@ wine_fn_has_flag ()
wine_fn_depend_rules () wine_fn_depend_rules ()
{ {
wine_fn_append_file SUBDIRS $ac_dir wine_fn_append_file SUBDIRS $ac_dir
wine_fn_append_rule \
"Makefile: $srcdir/$ac_dir/Makefile.in"
} }
wine_fn_pot_rules () wine_fn_pot_rules ()

7
tools/makedep.c
View File

@ -2845,15 +2845,22 @@ static struct strarray output_sources( const struct makefile *make )
if (make->subdirs.count) if (make->subdirs.count)
{ {
struct strarray makefile_deps = empty_strarray;
struct strarray distclean_files = empty_strarray; struct strarray distclean_files = empty_strarray;
for (i = 0; i < make->subdirs.count; i++) for (i = 0; i < make->subdirs.count; i++)
{ {
strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( make->submakes[i],
strmake ( "%s.in", output_makefile_name ))));
strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name ));
if (!make->src_dir) if (!make->src_dir)
strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" ));
if (make->submakes[i]->testdll) if (make->submakes[i]->testdll)
strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" ));
} }
output( "Makefile:" );
output_filenames( makefile_deps );
output( "\n" );
output( "distclean::\n"); output( "distclean::\n");
output( "\trm -f" ); output( "\trm -f" );
output_filenames( distclean_files ); output_filenames( distclean_files );