From 70098f6990d6c726e9520a32b74894dd7703e5f7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 10 Nov 2000 01:07:42 +0000
Subject: [PATCH] Don't link libwine_unicode into all dlls.

---
 dlls/Makedll.rules.in   | 4 ++--
 dlls/ntdll/Makefile.in  | 1 +
 dlls/ttydrv/Makefile.in | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 7dab0b6e8aa..922f0112b5f 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -24,7 +24,7 @@ all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%=lib%.$(LIBEXT))
 # Rules for .so files
 
 lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS)
+	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine $(EXTRALIBS)
 
 $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
 	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
@@ -42,7 +42,7 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a
 # Rules for checking that no imports are missing
 
 checklink:: lib$(MODULE).$(LIBEXT)
-	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS) $(LIBS) && $(RM) checklink
+	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS) && $(RM) checklink
 
 # Rules for debug channels
 
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 1d7450fd7b9..7eac3b051fb 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ntdll
 SOVERSION = 1.0
+EXTRALIBS = -lwine_unicode
 
 C_SRCS = \
 	critsection.c \
diff --git a/dlls/ttydrv/Makefile.in b/dlls/ttydrv/Makefile.in
index 1c5548be6cc..2b9c7d84908 100644
--- a/dlls/ttydrv/Makefile.in
+++ b/dlls/ttydrv/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ttydrv
 SOVERSION = 1.0
-EXTRALIBS = $(LIBS)
 IMPORTS   = user32 gdi32 kernel32 ntdll
 
 C_SRCS = \