ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Francois Gouget 2001-07-27 23:56:58 +00:00 committed by Alexandre Julliard
parent 0ce0bef9c1
commit 849cea008b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/winemaker
View File

@ -2375,9 +2375,7 @@ then
fi fi
CFLAGS="$CFLAGS -fPIC" 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(LDSHARED)
AC_SUBST(LDXXSHARED) AC_SUBST(LDXXSHARED)
AC_SUBST(LDDLLFLAGS) AC_SUBST(LDDLLFLAGS)
@ -2601,7 +2599,7 @@ then
else else
WINE_LIBRARY_ROOT="$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/lib"; WINE_LIBRARY_ROOT="$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/lib";
fi 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)]) AC_MSG_ERROR([Could not find the Wine libraries (libwine.so)])
],$WINE_LIBRARY_ROOT) ],$WINE_LIBRARY_ROOT)
if test -n "$WINE_LIBRARY_ROOT" if test -n "$WINE_LIBRARY_ROOT"
@ -2610,7 +2608,7 @@ then
else else
WINE_LIBRARY_PATH="" WINE_LIBRARY_PATH=""
fi 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)]) AC_MSG_ERROR([Could not find the Wine libraries (libntdll.so)])
],[$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/dlls]) ],[$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/dlls])
if test -n "$LIBNTDLL_PATH" -a "-L$LIBNTDLL_PATH" != "$WINE_LIBRARY_PATH" if test -n "$LIBNTDLL_PATH" -a "-L$LIBNTDLL_PATH" != "$WINE_LIBRARY_PATH"
@ -2847,13 +2845,13 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
WRCFLAGS = -r -L WRCFLAGS = -r -L
OPTIONS = @OPTIONS@ -D_REENTRANT -DWINELIB OPTIONS = @OPTIONS@ -D_REENTRANT -DWINELIB
DLL_LINK = @DLL_LINK@
LIBS = @LIBS@ $(LIBRARY_PATH) LIBS = @LIBS@ $(LIBRARY_PATH)
LN_S = @LN_S@ 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) ALLCFLAGS = $(CFLAGS) $(CEXTRA) $(OPTIONS) $(ALLFLAGS)
ALLCXXFLAGS=$(CXXFLAGS) $(CXXEXTRA) $(OPTIONS) $(ALLFLAGS) ALLCXXFLAGS=$(CXXFLAGS) $(CXXEXTRA) $(OPTIONS) $(ALLFLAGS)
ALLWRCFLAGS=$(WRCFLAGS) $(WRCEXTRA) $(OPTIONS) $(ALLFLAGS) ALLWRCFLAGS=$(WRCFLAGS) $(WRCEXTRA) $(OPTIONS) $(ALLFLAGS)
DLL_LINK = $(LIBRARY_PATH) $(LIBRARIES:%=-l%) $(WINE_LIBRARY_PATH) -lwine -lwine_unicode -lwine_uuid
LDCOMBINE = ld -r LDCOMBINE = ld -r
LDSHARED = @LDSHARED@ LDSHARED = @LDSHARED@
LDXXSHARED= @LDXXSHARED@ LDXXSHARED= @LDXXSHARED@