nptl: fix subdirs handling

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

11 files changed, 70 insertions, 5 deletions

diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index b32ee3fe7..e015807b9 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -5,9 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH) \
-	libpthread/nptl/sysdeps/unix/sysv/linux \
-	libpthread/nptl/sysdeps/pthread
+subdirs += libpthread/nptl
 
 libpthread-routines-y = init vars events version \
 		      pthread_create pthread_exit pthread_detach \
diff --git a/libpthread/nptl/sysdeps/Makefile b/libpthread/nptl/sysdeps/Makefile
new file mode 100644
index 000000000..1fea63600
--- /dev/null
+++ b/libpthread/nptl/sysdeps/Makefile
@@ -0,0 +1,13 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+top_srcdir:=../../../
+top_builddir:=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include ./Makefile.commonarch
+include $(top_srcdir)Makerules
diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch
index 669e9d318..32fb99884 100644
--- a/libpthread/nptl/sysdeps/Makefile.commonarch
+++ b/libpthread/nptl/sysdeps/Makefile.commonarch
@@ -4,6 +4,11 @@
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
+subdirs += libpthread/nptl/sysdeps \
+	   libpthread/nptl/sysdeps/$(TARGET_ARCH)
+ifneq ($(abspath libpthread/nptl/sysdeps/$(TARGET_ARCH)),$(abspath libpthread/nptl/sysdeps/$(TARGET_ARCH)/$(TARGET_SUBARCH)))
+subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH)/$(TARGET_SUBARCH)
+endif
 
 PTHREAD_ARCH_DIR  := $(top_srcdir)libpthread/nptl/sysdeps/$(TARGET_ARCH)
 PTHREAD_ARCH_OUT  := $(top_builddir)libpthread/nptl/sysdeps/$(TARGET_ARCH)
diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in
index 2091dca0a..03b2aa175 100644
--- a/libpthread/nptl/sysdeps/generic/Makefile.in
+++ b/libpthread/nptl/sysdeps/generic/Makefile.in
@@ -4,7 +4,7 @@
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-
+subdirs += libpthread/nptl/sysdeps/generic
 #
 # NOTE: Alpha and MIPS have their own versions of 'libc-tls.c' in
 #       their architecture specific directory which will override
diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
index 36d9eeb90..a8e27f5cb 100644
--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
+++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
@@ -5,6 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+subdirs += libpthread/nptl/sysdeps/pthread
 #
 # NOTE: glibc puts flockfile.c, ftrylockfile.c, funlockfile.c, and
 #       pt-longjmp.c in libc and libpthread. For uClibc, they are
diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch
index 3cd2e67e6..d657cedd5 100644
--- a/libpthread/nptl/sysdeps/sparc/Makefile.arch
+++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch
@@ -4,7 +4,7 @@
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-
+subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH)/$(TARGET_SUBARCH)/sparv9
 libpthread_CSRC = sparc32/pthread_spin_lock.c \
 				  sparc32/pthread_spin_trylock.c
 
diff --git a/libpthread/nptl/sysdeps/unix/Makefile b/libpthread/nptl/sysdeps/unix/Makefile
new file mode 100644
index 000000000..3ed177ae2
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/Makefile
@@ -0,0 +1,13 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+top_srcdir=../../../../
+top_builddir=../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/nptl/sysdeps/unix/Makefile.in b/libpthread/nptl/sysdeps/unix/Makefile.in
new file mode 100644
index 000000000..c2c9bcd36
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/Makefile.in
@@ -0,0 +1,8 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+subdirs += libpthread/nptl/sysdeps/unix
diff --git a/libpthread/nptl/sysdeps/unix/sysv/Makefile b/libpthread/nptl/sysdeps/unix/sysv/Makefile
new file mode 100644
index 000000000..64f51c8dd
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/Makefile
@@ -0,0 +1,13 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+top_srcdir=../../../../../
+top_builddir=../../../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libpthread/nptl/sysdeps/unix/sysv/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/Makefile.in
new file mode 100644
index 000000000..832561646
--- /dev/null
+++ b/libpthread/nptl/sysdeps/unix/sysv/Makefile.in
@@ -0,0 +1,8 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+subdirs += libpthread/nptl/sysdeps/unix/sysv
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch
index 09d967616..4f09da4e1 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch
@@ -5,6 +5,12 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+subdirs += libpthread/nptl/sysdeps/unix/sysv/linux \
+	   libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)
+ifneq ($(abspath libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)),$(abspath libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/$(TARGET_SUBARCH)))
+subdirs += libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/$(TARGET_SUBARCH)
+endif
+
 libpthread_CSRC = pthread_attr_getaffinity.c				\
 		  pthread_attr_setaffinity.c pthread_getaffinity.c	\
 		  pthread_getcpuclockid.c pthread_kill.c		\