[3/4] winemaker: Also copy a module.def file to a libmodule.def file when available

[André Hentschel]

---
 tools/winemaker |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/winemaker b/tools/winemaker
index 26a9782..baac85c 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1027,7 +1027,7 @@ sub source_scan_project_file($$)
         @$target[$T_TYPE]=$TT_DLL;
         my $canon=canonize($prj_name);
         if (@$project_settings[$T_FLAGS] & $TF_HASDEF) {
-            push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)");
+            push @{@$target[$T_LDFLAGS]},("-shared","lib\$(${canon}_MODULE:.dll=.def)");
         } else {
             push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)");
         }
@@ -1542,7 +1542,7 @@ sub source_scan_directory($$$$)
       push @local_dlls,$target_name;
       my $canon=canonize($target_name);
       if (@$project_settings[$T_FLAGS] & $TF_HASDEF) {
-          push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.def)");
+          push @{@$target[$T_LDFLAGS]},("-shared","lib\$(${canon}_MODULE:.dll=.def)");
       } else {
           push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)");
       }
@@ -2508,6 +2508,7 @@ sub generate_project_files($)
   print FILEO "CXX = wineg++\n";
   print FILEO "RC = wrc\n";
   print FILEO "AR = ar\n";
+  print FILEO "CP = cp\n";
   print FILEO "\n\n";
 
   print FILEO "### Generic targets\n\n";
@@ -2568,6 +2569,7 @@ sub generate_project_files($)
 
       if (@$target[$T_TYPE] == $TT_DLL && (@$project_settings[$T_FLAGS] & $TF_HASDEF)) {
         print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.def)\n";
+        print FILEO "\t\$(CP) \$(${canon}_MODULE:.dll=.def) lib\$(${canon}_MODULE:.dll=.def)\n";
       } elsif (@$target[$T_TYPE] == $TT_DLL) {
         print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n";
         print FILEO "\t\$(WINEBUILD) --def -E \$(${canon}_MODULE:.dll=.spec) -o lib\$(${canon}_MODULE:.dll=.def)\n";
-- 
1.7.4.1



-- 

Best Regards, André Hentschel