From 80f876c3fa73314c3d330284bee4cb87a1842e63 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 1 Oct 2005 17:34:42 +0000
Subject: Again, I need to cut down on my merge times and this last set of
 changes to the makefile structure is killing me. Sorry to put more native
 thread stuff in, but it cannot be activated in the trunk, so there is no
 harm.

---
 libpthread/Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'libpthread')

diff --git a/libpthread/Makefile b/libpthread/Makefile
index 60ad7563d..18292917a 100644
--- 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
-- 
cgit v1.2.3