winemaker fixes

[Francois Gouget]

Changelog:

 * tools/winemaker

   Francois Gouget <fgouget at codeweavers.com>

   Put the per project paths before the wine paths
   Remove unnecessary libraries from the wine link test
   Move DLL_LINK from configure.in to the Make.rules file

--
Francois Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.29
diff -u -r1.29 winemaker
--- tools/winemaker	2001/07/12 22:21:44	1.29
+++ tools/winemaker	2001/07/27 19:25:29
@@ -2375,9 +2375,7 @@
 fi
 
 CFLAGS="$CFLAGS -fPIC"
-DLL_LINK="\$(WINE_LIBRARY_PATH) \$(LIBRARY_PATH) \$(LIBRARIES:%=-l%) -lwine -lwine_unicode -lwine_uuid"
 
-AC_SUBST(DLL_LINK)
 AC_SUBST(LDSHARED)
 AC_SUBST(LDXXSHARED)
 AC_SUBST(LDDLLFLAGS)
@@ -2601,7 +2599,7 @@
 else
   WINE_LIBRARY_ROOT="$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/lib";
 fi
-AC_PATH_LIBRARY(WINE_LIBRARY_ROOT,[-lwine],[-lutil],[
+AC_PATH_LIBRARY(WINE_LIBRARY_ROOT,[-lwine],[],[
   AC_MSG_ERROR([Could not find the Wine libraries (libwine.so)])
 ],$WINE_LIBRARY_ROOT)
 if test -n "$WINE_LIBRARY_ROOT"
@@ -2610,7 +2608,7 @@
 else
   WINE_LIBRARY_PATH=""
 fi
-AC_PATH_LIBRARY(LIBNTDLL_PATH,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode -lncurses -ldl -lutil],[
+AC_PATH_LIBRARY(LIBNTDLL_PATH,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[
   AC_MSG_ERROR([Could not find the Wine libraries (libntdll.so)])
 ],[$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/dlls])
 if test -n "$LIBNTDLL_PATH" -a "-L$LIBNTDLL_PATH" != "$WINE_LIBRARY_PATH"
@@ -2847,13 +2845,13 @@
 CXXFLAGS  = @CXXFLAGS@
 WRCFLAGS  = -r -L
 OPTIONS   = @OPTIONS@ -D_REENTRANT -DWINELIB
-DLL_LINK  = @DLL_LINK@
 LIBS      = @LIBS@ $(LIBRARY_PATH)
 LN_S      = @LN_S@
-ALLFLAGS  = $(DEFINES) -I$(SRCDIR) $(WINE_INCLUDE_PATH) $(INCLUDE_PATH)
+ALLFLAGS  = $(DEFINES) -I$(SRCDIR) $(INCLUDE_PATH) $(WINE_INCLUDE_PATH)
 ALLCFLAGS = $(CFLAGS) $(CEXTRA) $(OPTIONS) $(ALLFLAGS)
 ALLCXXFLAGS=$(CXXFLAGS) $(CXXEXTRA) $(OPTIONS) $(ALLFLAGS)
 ALLWRCFLAGS=$(WRCFLAGS) $(WRCEXTRA) $(OPTIONS) $(ALLFLAGS)
+DLL_LINK  = $(LIBRARY_PATH) $(LIBRARIES:%=-l%) $(WINE_LIBRARY_PATH) -lwine -lwine_unicode -lwine_uuid
 LDCOMBINE = ld -r
 LDSHARED  = @LDSHARED@
 LDXXSHARED= @LDXXSHARED@