Moved the pthread emulation into the main binary so that we don't need to link it against ntdll.
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 521ccd3..6cc6793 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in
@@ -7,7 +7,6 @@ EXTRALIBS = $(LIBUNICODE) @LIBPTHREAD@ C_SRCS = \ - $(TOPOBJDIR)/scheduler/pthread.c \ cdrom.c \ critsection.c \ debugtools.c \ @@ -50,8 +49,6 @@ SUBDIRS = tests -EXTRASUBDIRS = $(TOPOBJDIR)/scheduler - @MAKE_DLL_RULES@ relay32.s: $(WINEBUILD)
diff --git a/miscemu/Makefile.in b/miscemu/Makefile.in index 3670505..bb6fca0 100644 --- a/miscemu/Makefile.in +++ b/miscemu/Makefile.in
@@ -5,16 +5,19 @@ 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)