Moved the pthread emulation into the main binary so that we don't need

to link it against ntdll.

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)

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)