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

makefiles: Also build import libs for extra test modules. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-06-12 19:40:25 +02:00
parent b531e51cd7
commit c873db8c1d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/makedep.c
View File

@ -183,6 +183,7 @@ struct makefile
struct strarray install_lib; struct strarray install_lib;
struct strarray install_dev; struct strarray install_dev;
struct strarray extra_targets; struct strarray extra_targets;
struct strarray extra_imports;
struct list sources; struct list sources;
struct list includes; struct list includes;
const char *base_dir; const char *base_dir;
@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make )
if (!make->disabled) if (!make->disabled)
strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" ));
} }
if (strendswith( source->name, ".spec" ))
{
char *obj = replace_extension( source->name, ".spec", "" );
strarray_addall_uniq( &make->extra_imports,
get_expanded_file_local_var( make, obj, "IMPORTS" ));
}
} }
if (make->testdll) if (make->testdll)
{ {
@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make )
if (make->is_cross) if (make->is_cross)
{ {
for (i = 0; i < make->imports.count; i++) strarray_addall_uniq( &cross_import_libs, make->imports );
strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); strarray_addall_uniq( &cross_import_libs, make->extra_imports );
if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" );
strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "winecrt0" );
strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "kernel32" );