Use libwine and libwine_unicode directly from their build directory
instead of using symlinks.
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index f732073..f5d126a 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -16,7 +16,7 @@
ALLNAMES = lib$(MODULE).so $(ALTNAMES:%=lib%.so)
SPEC_SRCS = $(ALTNAMES:%=%.spec)
ALL_OBJS = $(MODULE).spec.o $(OBJS)
-ALL_LIBS = -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS)
+ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%=lib%.$(LIBEXT))
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index eb85449..57d29c3 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comctl32
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in
index d9907e7..a8fbe3c 100644
--- a/dlls/crtdll/Makefile.in
+++ b/dlls/crtdll/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = crtdll
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in
index 295be26..1b78601 100644
--- a/dlls/lzexpand/Makefile.in
+++ b/dlls/lzexpand/Makefile.in
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = lz32
ALTNAMES = lzexpand
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 7eac3b0..3052733 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = ntdll
SOVERSION = 1.0
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
C_SRCS = \
critsection.c \
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 2645fc8..5dc905a 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = shell32
ALTNAMES = shell
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in
index 2cefbc0..2f484ad 100644
--- a/dlls/shlwapi/Makefile.in
+++ b/dlls/shlwapi/Makefile.in
@@ -3,7 +3,7 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shlwapi
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in
index 96951f0..343ca76 100644
--- a/dlls/version/Makefile.in
+++ b/dlls/version/Makefile.in
@@ -4,7 +4,7 @@
VPATH = @srcdir@
MODULE = version
ALTNAMES = ver
-EXTRALIBS = -lwine_unicode
+EXTRALIBS = $(LIBUNICODE)
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
diff --git a/if1632/Makefile.in b/if1632/Makefile.in
index cb78c74..8e72f0d 100644
--- a/if1632/Makefile.in
+++ b/if1632/Makefile.in
@@ -24,6 +24,6 @@
$(LDCOMBINE) $(OBJS) -o $@
asmrelay.s: $(WINEBUILD)
- LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -relay
+ $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -relay
### Dependencies:
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index e9f0a84..bc630f7 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -6,7 +6,7 @@
VPATH = @srcdir@
MODULE = none
PROGRAMS = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
-ALL_LIBS = -L$(TOPOBJDIR) -lwine $(LIBS)
+ALL_LIBS = $(LIBWINE) $(LIBS)
C_SRCS = \
expand.c \
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index 9e3ea02..9220cf4 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -11,7 +11,7 @@
DEFS = @DLLFLAGS@ $(EXTRADEFS)
LDDLLFLAGS = @LDDLLFLAGS@
ALL_OBJS = $(MODULE).spec.o $(OBJS)
-ALL_LIBS = -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS)
+ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
SYMBOLFILE = $(MODULE).tmp.o
all: $(MODULE)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index f80e9c0..bf02917 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -6,7 +6,7 @@
VPATH = @srcdir@
MODULE = none
PROGRAMS = icinfo aviinfo aviplay
-ALL_LIBS = -L$(TOPOBJDIR) -lwine $(LIBS)
+ALL_LIBS = $(LIBWINE) $(LIBS)
SPEC_SRCS = \
icinfo.spec \
diff --git a/server/Makefile.in b/server/Makefile.in
index 6f1c36a..e0bb99e 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -44,7 +44,7 @@
@MAKE_RULES@
wineserver: $(OBJS)
- $(CC) -o $(PROGRAMS) $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LIBS) $(LDFLAGS)
+ $(CC) -o $(PROGRAMS) $(OBJS) $(LIBUNICODE) $(LIBS) $(LDFLAGS)
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
index 2adb726..67fce56 100644
--- a/tools/winebuild/Makefile.in
+++ b/tools/winebuild/Makefile.in
@@ -22,11 +22,11 @@
@MAKE_RULES@
-winebuild: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o winebuild $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LDFLAGS)
+winebuild: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
+ $(CC) $(CFLAGS) -o winebuild $(OBJS) $(LIBUNICODE) $(LDFLAGS)
-$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
- cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
+$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
+ cd `dirname $@` && $(MAKE) `basename $@`
install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir)
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index 807bfca..cccb6c5 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -24,11 +24,11 @@
@MAKE_RULES@
-wmc: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o wmc $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LEXLIB) $(LDFLAGS)
+wmc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
+ $(CC) $(CFLAGS) -o wmc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
-$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
- cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
+$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
+ cd `dirname $@` && $(MAKE) `basename $@`
y.tab.c y.tab.h: mcy.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/mcy.y
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index 58aa52d..ae05f52 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -27,11 +27,11 @@
@MAKE_RULES@
-wrc: $(OBJS) $(TOPOBJDIR)/libwine_unicode.$(LIBEXT)
- $(CC) $(CFLAGS) -o wrc $(OBJS) -L$(TOPOBJDIR) -lwine_unicode $(LEXLIB) $(LDFLAGS)
+wrc: $(OBJS) $(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT)
+ $(CC) $(CFLAGS) -o wrc $(OBJS) $(LIBUNICODE) $(LEXLIB) $(LDFLAGS)
-$(TOPOBJDIR)/libwine_unicode.$(LIBEXT):
- cd $(TOPOBJDIR) && $(MAKE) libwine_unicode.$(LIBEXT)
+$(TOPOBJDIR)/unicode/libwine_unicode.$(LIBEXT):
+ cd `dirname $@` && $(MAKE) `basename $@`
y.tab.c y.tab.h: parser.y
$(YACC) $(YACCOPT) -d -t $(SRCDIR)/parser.y
