Cleanup original linuxthreads and update top-level threads makefiles.

libpthread/Makefile

@@ -68,7 +68,7 @@ ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
 	SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
 endif
 
-ALL_SUBDIRS = linuxthreads linuxthreads_db
+ALL_SUBDIRS = linuxthreads linuxthreads_db nptl nptl_db
 
 all: $(LIBPTHREAD) $(LIBTHREAD_DB)
 

libpthread/linuxthreads/Makefile

@@ -39,10 +39,7 @@ CFLAGS :=$(CFLAGS:-O0=-O1)
 
 # set up system dependencies include dirs (NOTE: order matters!)
 PTDIR = $(TOPDIR)libpthread/linuxthreads/
-SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \
+SYSDEPINC = -I$(PTDIR)sysdeps/pthread \
-            -I$(PTDIR)sysdeps/pthread \
-            -I$(PTDIR)sysdeps/unix/sysv \
-            -I$(PTDIR)sysdeps/unix/unix \
             -I$(PTDIR)sysdeps/$(TARGET_ARCH) \
             -I$(PTDIR)sysdeps \
             -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH)