From 08a64e6e6a6194c6ec30b2e3aa3c549ea03dfc4d Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 10 Oct 2003 23:37:18 +0000
Subject: [PATCH] Moved the pthread emulation into the main binary so that we
 don't need to link it against ntdll.

---
 dlls/ntdll/Makefile.in | 3 ---
 miscemu/Makefile.in    | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 521ccd3b3d6..6cc6793d0ab 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -7,7 +7,6 @@ MODULE    = ntdll.dll
 EXTRALIBS = $(LIBUNICODE) @LIBPTHREAD@
 
 C_SRCS = \
-	$(TOPOBJDIR)/scheduler/pthread.c \
 	cdrom.c \
 	critsection.c \
 	debugtools.c \
@@ -50,8 +49,6 @@ EXTRA_OBJS = $(ASM_SRCS:.s=.o)
 
 SUBDIRS = tests
 
-EXTRASUBDIRS = $(TOPOBJDIR)/scheduler
-
 @MAKE_DLL_RULES@
 
 relay32.s: $(WINEBUILD)
diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in
index 36705052bfb..bb6fca02b90 100644
--- a/miscemu/Makefile.in
+++ b/miscemu/Makefile.in
@@ -5,16 +5,19 @@ VPATH     = @srcdir@
 MODULE    = wine
 
 C_SRCS = \
+	$(TOPOBJDIR)/scheduler/pthread.c \
 	main.c
 
+EXTRASUBDIRS = $(TOPOBJDIR)/scheduler
+
 all: $(MODULE)
 
 @MAKE_RULES@
 
 LDEXECFLAGS = @LDEXECFLAGS@
 
-$(MODULE): $(OBJS) Makefile.in $(DLLDIR)/libntdll.dll.$(LIBEXT)
-	$(CC) -o $@ $(LDEXECFLAGS) $(OBJS) -L$(DLLDIR) -lntdll.dll $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS)
+$(MODULE): $(OBJS) Makefile.in
+	$(CC) -o $@ $(LDEXECFLAGS) $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS)
 
 install:: $(MODULE)
 	$(MKINSTALLDIRS) $(bindir)