winemaker: Fix dll handling

[Francois Gouget]

Till now winemaker did not know how to compile dlls using winegcc. Now 
it's fixed but the user still has to generate a .spec file by hand.


Changelog:

  * tools/winemaker

    Fix dll handling.
    Take DLL_PATH and LIBRARIES into account.
    Simplify a check for paths that don't start with a '/'.

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                             $live{free} || die "";
-------------- next part --------------
Index: tools/winemaker
===================================================================
RCS file: /var/cvs/wine/tools/winemaker,v
retrieving revision 1.78
diff -u -r1.78 winemaker
--- tools/winemaker	13 Dec 2004 12:00:59 -0000	1.78
+++ tools/winemaker	10 Jan 2005 15:02:06 -0000
@@ -798,6 +798,8 @@
       @$target[$T_TYPE]=$TT_DLL;
       push @local_depends,"$target_name.so";
       push @local_dlls,$target_name;
+      my $canon=canonize($target_name);
+      push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:%=%.spec)");
     } else {
       @$target[$T_TYPE]=$opt_target_type;
       push @exe_list,$target;
@@ -1074,7 +1076,7 @@
 
   if ($dirname eq "" or $dirname eq ".") {
     $dirname=cwd;
-  } elsif ($dirname =~ m+^[^/]+) {
+  } elsif ($dirname !~ m+^/+) {
     $dirname=cwd . "/" . $dirname;
   }
   if ($dirname !~ m+/$+) {
@@ -1552,7 +1554,7 @@
 }
 
 ##
-# Generates a project's Makefile.in and all the target files
+# Generates a project's Makefile and all the target files
 sub generate_project_files($)
 {
   my $project=$_[0];
@@ -1739,7 +1741,8 @@
   print FILEO "\n";
 
   if (@{@$project[$P_TARGETS]} > 0) {
-    print FILEO "### Target specific build rules\n\n";
+    print FILEO "### Target specific build rules\n";
+    print FILEO "DEFLIB = \$(LIBRARY_PATH) \$(LIBRARIES) \$(DLL_PATH)\n\n";
     foreach my $target (@{@$project[$P_TARGETS]}) {
       my $canon=canonize("@$target[$T_NAME]");
       $canon =~ s/_so$//;
@@ -1753,7 +1756,7 @@
       } else {
         print FILEO "\t\$(CC)";
       }
-      print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_MODULE).dbg.o \$(${canon}_LIBRARY_PATH) \$(LIBRARY_PATH) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n";
+      print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_MODULE).dbg.o \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n";
       print FILEO "\n\n";
     }
   }