Alexandre Julliard : makefiles: Don' t depend on cross import library if not necessary.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu May 16 22:54:45 2019 +0200

makefiles: Don't depend on cross import library if not necessary.

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

---

 tools/makedep.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 24def39..7ed9efd 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3553,9 +3553,13 @@ static void output_subdirs( struct makefile *make )
                 }
                 else
                 {
-                    strarray_add( &build_deps, strmake( "%s.a", importlib_path ));
-                    if (needs_delay_lib( submake )) output( "%s.delay.a ", importlib_path );
+                    if (needs_delay_lib( submake ))
+                    {
+                        output( "%s.delay.a ", importlib_path );
+                        strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
+                    }
                     output( "%s.a: %s", importlib_path, spec_file );
+                    strarray_add( &build_deps, strmake( "%s.a", importlib_path ));
                 }
                 output_filename( tools_path( make, "winebuild" ));
                 output( "\n" );
@@ -3568,8 +3572,16 @@ static void output_subdirs( struct makefile *make )
                 output( "\n" );
                 if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake )))
                 {
-                    if (needs_cross_lib( submake )) output_filename( strmake( "%s.cross.a", importlib_path ));
-                    if (needs_delay_lib( submake )) output_filename( strmake( "%s.delay.a", importlib_path ));
+                    if (needs_cross_lib( submake ))
+                    {
+                        output_filename( strmake( "%s.cross.a", importlib_path ));
+                        strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path ));
+                    }
+                    if (needs_delay_lib( submake ))
+                    {
+                        output_filename( strmake( "%s.delay.a", importlib_path ));
+                        strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
+                    }
                     output( ": %s", spec_file );
                     output_filename( tools_path( make, "winebuild" ));
                     output( "\n" );
@@ -3578,10 +3590,7 @@ static void output_subdirs( struct makefile *make )
                     output_filename( "--export" );
                     output_filename( spec_file );
                     output( "\n" );
-                    strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path ));
                 }
-                if (needs_delay_lib( submake ))
-                    strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
             }
             strarray_addall( &symlinks, output_importlib_symlinks( make, submake ));
         }