Again, I need to cut down on my merge times and this last set of changes to the makef...

diff --git a/libpthread/Makefile b/libpthread/Makefile
index 60ad756..1829291 100644 (file)
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -19,11 +19,18 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+ALL_SUBDIRS = nptl nptl_db
+DIRS = nptl
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+       DIRS += nptl_db
+endif
+else
 ALL_SUBDIRS = linuxthreads linuxthreads_db
-
-DIRS=linuxthreads
+DIRS = linuxthreads
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-       DIRS+=linuxthreads_db
+        DIRS += linuxthreads_db
+endif
 endif
 
 all: subdirs