More winemaker fixes

[Martin Wilck]

Patch: winemaker-dlls.diff

Martin Wilck <Martin.Wilck at fujitsu-siemens.com>
Patch against: CVS 2002-09-10

Modified files:
        - tools:        winemaker

* -i command line option was ignored (regression since 1.41) - fix.
* Fix perl syntax bug for --nodlls (1.46)
* Fix incorrect usage() for --nodlls (1.46)

Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.47
diff -u -r1.47 winemaker
--- tools/winemaker	10 Sep 2002 00:42:43 -0000	1.47
+++ tools/winemaker	10 Sep 2002 12:20:03 -0000
@@ -801,8 +801,8 @@
     # which we don't have in Wine. Also I add ntdll which seems
     # necessary for Winelib.
     my @std_dlls=qw(advapi32.dll comdlg32.dll gdi32.dll kernel32.dll ntdll.dll odbc32.dll ole32.dll oleaut32.dll shell32.dll user32.dll winspool.drv);
-    if (@$target[$T_FLAGS] & $TF_NODLLS == 0) {
-      @$target[$T_DLLS]=\@std_dlls;
+    if ((@$target[$T_FLAGS] & $TF_NODLLS) == 0) {
+      @$target[$T_DLLS] = \@std_dlls;
     } else {
       @$target[$T_DLLS]=[];
     }
@@ -1830,6 +1830,8 @@
 		  });
     generate_list("LIBRARIES",$no_extra,@$project_settings[$T_LIBRARIES]);
     generate_list("",1,$global_settings[$T_LIBRARIES]);
+    generate_list("GLOBAL_DLLS",$no_extra,@$project_settings[$T_DLLS]);
+    generate_list("",1,$global_settings[$T_DLLS]);
     print FILEO "\n\n";
 
     my $extra_source_count=@{@$project_settings[$T_SOURCES_C]}+
@@ -1981,7 +1983,7 @@
       }
 
       print FILEO "\$(${canon}_SPEC_SRCS:.spec=.spec.c): \$(${canon}_SPEC_SRCS) \$(${canon}_OBJS) \$(${canon}_RC_SRCS:.rc=.res)\n";
-      print FILEO "\t\$(LD_PATH) \$(WINEBUILD) -fPIC \$(${canon}_DLL_PATH) \$(WINE_DLL_PATH) \$(${canon}_DLLS:%=-l%) \$(${canon}_RC_SRCS:%.rc=-res %.res) $mode \$(${canon}_OBJS) -o \$\@ -spec \$(SRCDIR)/\$(${canon}_SPEC_SRCS)\n";
+      print FILEO "\t\$(LD_PATH) \$(WINEBUILD) -fPIC \$(${canon}_DLL_PATH) \$(WINE_DLL_PATH) \$(GLOBAL_DLLS:%=-l%) \$(${canon}_DLLS:%=-l%) \$(${canon}_RC_SRCS:%.rc=-res %.res) $mode \$(${canon}_OBJS) -o \$\@ -spec \$(SRCDIR)/\$(${canon}_SPEC_SRCS)\n";
       print FILEO "\n";
       my $t_name=@$target[$T_NAME];
       if (@$target[$T_TYPE]!=$TT_DLL) {
@@ -2199,9 +2201,9 @@
   print STDERR "Usage: winemaker [--nobanner] [--backup|--nobackup] [--nosource-fix]\n";
   print STDERR "                 [--lower-none|--lower-all|--lower-uppercase]\n";
   print STDERR "                 [--lower-include|--nolower-include]\n";
-  print STDERR "                 [--guiexe|--windows|--cuiexe|--console|--dll|--nodlls]\n";
+  print STDERR "                 [--guiexe|--windows|--cuiexe|--console|--dll]\n";
   print STDERR "                 [--wrap|--nowrap] [--mfc|--nomfc]\n";
-  print STDERR "                 [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n";
+  print STDERR "                 [-Dmacro[=defn]] [-Idir] [-Pdir] [--nodlls] [-idll] [-Ldir] [-llibrary]\n";
   print STDERR "                 [--interactive] [--single-target name]\n";
   print STDERR "                 [--generated-files|--nogenerated-files] [--nogenerated-specs]\n";
   print STDERR "                 work_directory\n";

-- 
Martin Wilck                Phone: +49 5251 8 15113
Fujitsu Siemens Computers   Fax:   +49 5251 8 20409
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck at Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy