Small winemaker tweaks

[François Gouget]

Changelog:

   François Gouget <fgouget at codeweavers.com>

 * tools/winemaker

   configure.in: Remove unused OPTIONS variable
   configure.in: Remove unnecessary AC_PROG_RANLIB check
   Cosmetic changes

-- 
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.26
diff -u -r1.26 winemaker
--- tools/winemaker	2001/05/07 18:19:57	1.26
+++ tools/winemaker	2001/05/24 22:05:03
@@ -1860,12 +1860,12 @@
   print FILEO "\n\n\n";
 
   print FILEO "### Generic autoconf targets\n\n";
-  print FILEO "all: ";
+  print FILEO "all:";
   if (@$project[$P_PATH] eq "") {
-    print FILEO "\$(SUBDIRS)";
+    print FILEO " \$(SUBDIRS)";
   }
   if (@{@$project[$P_TARGETS]} > 0) {
-    print FILEO "\$(DLLS) \$(EXES:%=%.so)";
+    print FILEO " \$(DLLS) \$(EXES:%=%.so)";
   }
   print FILEO "\n\n";
   print FILEO "\@MAKE_RULES\@\n";
@@ -2251,10 +2251,6 @@
 
 NEEDS_MFC=##WINEMAKER_NEEDS_MFC##
 
-dnl **** Command-line arguments ****
-
-AC_SUBST(OPTIONS)
-
 dnl **** Check for some programs ****
 
 AC_PROG_MAKE_SET
@@ -2262,7 +2258,6 @@
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PATH_XTRA
-AC_PROG_RANLIB
 AC_PROG_LN_S
 AC_PATH_PROG(LDCONFIG, ldconfig, true, /sbin:/usr/sbin:$PATH)
 
@@ -2843,8 +2838,6 @@
 # Global rules shared by all makefiles     -*-Makefile-*-
 #
 # Each individual makefile must define the following variables:
-# WINE_INCLUDE_ROOT: Wine's headers location
-# WINE_LIBRARY_ROOT: Wine's libraries location
 # TOPOBJDIR    : top-level object directory
 # SRCDIR       : source directory for this module
 #
@@ -2895,7 +2886,7 @@
 CFLAGS    = @CFLAGS@
 CXXFLAGS  = @CXXFLAGS@
 WRCFLAGS  = -r -L
-OPTIONS   = @OPTIONS@ -D_REENTRANT -DWINELIB
+OPTIONS   = -D_REENTRANT -DWINELIB
 X_CFLAGS  = @X_CFLAGS@
 X_LIBS    = @X_LIBS@
 XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@