Alexandre Julliard : makefiles: Also build import libs for extra test modules.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c873db8c1d089ad5c8d87acbbe74b2024a537b8b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c873db8c1d089ad5c8d87acbbe74b2024a537b8b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 12 19:40:25 2020 +0200

makefiles: Also build import libs for extra test modules.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/makedep.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 536d2263e3..743eaf6e35 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -183,6 +183,7 @@ struct makefile
     struct strarray install_lib;
     struct strarray install_dev;
     struct strarray extra_targets;
+    struct strarray extra_imports;
     struct list     sources;
     struct list     includes;
     const char     *base_dir;
@@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make )
             if (!make->disabled)
                 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)
     {
@@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make )
 
     if (make->is_cross)
     {
-        for (i = 0; i < make->imports.count; i++)
-            strarray_add_uniq( &cross_import_libs, make->imports.str[i] );
+        strarray_addall_uniq( &cross_import_libs, make->imports );
+        strarray_addall_uniq( &cross_import_libs, make->extra_imports );
         if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" );
         strarray_add_uniq( &cross_import_libs, "winecrt0" );
         strarray_add_uniq( &cross_import_libs, "kernel32" );