Alexandre Julliard : makefiles: Shared library and import library are not exclusive for PE builds.

Alexandre Julliard julliard at winehq.org
Mon Feb 26 13:42:20 CST 2018


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 26 18:46:50 2018 +0100

makefiles: Shared library and import library are not exclusive for PE builds.

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

---

 tools/makedep.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 470a495..caaa50f 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3624,11 +3624,13 @@ static void output_sources( struct makefile *make )
 
     if (make->staticlib) output_static_lib( make );
     else if (make->module) output_module( make );
-    else if (make->importlib) output_import_lib( make );
-    else if (make->sharedlib) output_shared_lib( make );
     else if (make->testdll) output_test_module( make );
-
-    if (make->programs.count) output_programs( make );
+    else
+    {
+        if (make->importlib) output_import_lib( make );
+        if (make->sharedlib) output_shared_lib( make );
+        if (make->programs.count) output_programs( make );
+    }
 
     for (i = 0; i < make->scripts.count; i++)
         add_install_rule( make, make->scripts.str[i], make->scripts.str[i],




More information about the wine-cvs mailing list