svn commit: trunk/uClibc: libpthread

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-10-07 18:30:59 -0700 (Fri, 07 Oct 2005)
New Revision: 11804

Log:
Fix up PTDIR bug and clean target for libpthread.


Modified:
   trunk/uClibc/Rules.mak
   trunk/uClibc/libpthread/Makefile


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-10-07 18:45:03 UTC (rev 11803)
+++ trunk/uClibc/Rules.mak	2005-10-08 01:30:59 UTC (rev 11804)
@@ -309,17 +309,17 @@
 else
 	PTNAME := linuxthreads
 endif
-PTDIR := $(TOPDIR)libpthread/$(PTNAME)/
+PTDIR := $(TOPDIR)libpthread/$(PTNAME)
 # set up system dependencies include dirs (NOTE: order matters!)
 ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
-PTINC := -I$(PTDIR)compat					\
-	 -I$(PTDIR)sysdeps/unix/sysv/linux/$(TARGET_ARCH)	\
-	 -I$(PTDIR)sysdeps/$(TARGET_ARCH)			\
-	 -I$(PTDIR)sysdeps/unix/sysv/linux			\
-	 -I$(PTDIR)sysdeps/pthread				\
-	 -I$(PTDIR)sysdeps/pthread/bits				\
-	 -I$(PTDIR)sysdeps/generic				\
-	 -include $(PTDIR)compat/libc-symbols.h
+PTINC := -I$(PTDIR)/compat					\
+	 -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)	\
+	 -I$(PTDIR)/sysdeps/$(TARGET_ARCH)			\
+	 -I$(PTDIR)/sysdeps/unix/sysv/linux			\
+	 -I$(PTDIR)/sysdeps/pthread				\
+	 -I$(PTDIR)/sysdeps/pthread/bits			\
+	 -I$(PTDIR)/sysdeps/generic				\
+	 -include $(PTDIR)/compat/libc-symbols.h
 #
 # Test for TLS if NPTL support was selected.
 #
@@ -340,8 +340,8 @@
 else
 # psm: the next 2 are probably incorrect, the generic header will
 # win over the arch specific one
-PTINC := -I$(PTDIR)sysdeps/pthread				\
-         -I$(PTDIR)sysdeps/$(TARGET_ARCH)
+PTINC := -I$(PTDIR)/sysdeps/pthread				\
+         -I$(PTDIR)/sysdeps/$(TARGET_ARCH)
 endif
 endif
 

Modified: trunk/uClibc/libpthread/Makefile
===================================================================
--- trunk/uClibc/libpthread/Makefile	2005-10-07 18:45:03 UTC (rev 11803)
+++ trunk/uClibc/libpthread/Makefile	2005-10-08 01:30:59 UTC (rev 11804)
@@ -61,6 +61,10 @@
 		$(TOPDIR)include/thread_db.h \
 		$(TOPDIR)include/bits/pthreadtypes.h $(TOPDIR)include/bits/semaphore.h \
 		$(TOPDIR)include/bits/libc-lock.h $(TOPDIR)include/bits/stdio-lock
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+	$(RM)	$(PTNAME)/version.h $(PTDIR)/banner.h \
+		$(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c
+endif
 
 clean: subdirs_clean headers_clean