svn commit: trunk/uClibc: libpthread

psm at uclibc.org psm at uclibc.org
Thu Oct 27 12:07:47 UTC 2005


Author: psm
Date: 2005-10-27 05:07:45 -0700 (Thu, 27 Oct 2005)
New Revision: 11929

Log:
Correct header cleanup, if threads are disabled, thanks to Jan-Benedict Glaw reporting it.

Modified:
   trunk/uClibc/Makefile.in
   trunk/uClibc/libpthread/Makefile.in


Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in	2005-10-27 07:22:02 UTC (rev 11928)
+++ trunk/uClibc/Makefile.in	2005-10-27 12:07:45 UTC (rev 11929)
@@ -346,8 +346,8 @@
 	$(RM) libc/misc/internals/interp.c
 	$(RM) include/fpu_control.h
 	$(MAKE) -C extra/locale clean
-	$(MAKE) -C ldso ldso_headers_clean
-	$(MAKE) -C libpthread threads_headers_clean
+	$(MAKE) -C ldso headers_clean-y
+	$(MAKE) -C libpthread headers_clean-y
 	$(MAKE) -C test clean
 	$(MAKE) -C utils clean
 	@set -e; \

Modified: trunk/uClibc/libpthread/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/Makefile.in	2005-10-27 07:22:02 UTC (rev 11928)
+++ trunk/uClibc/libpthread/Makefile.in	2005-10-27 12:07:45 UTC (rev 11929)
@@ -5,6 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
 DIRS:= $(PTNAME) $(PTNAME)_db
 libs: subdirs
@@ -33,6 +34,8 @@
 	$(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
 endif
 
+endif
+
 headers_clean-y+=threads_headers_clean
 
 threads_headers_clean:
@@ -40,6 +43,7 @@
 		$(top_builddir)include/thread_db.h \
 		$(top_builddir)include/bits/pthreadtypes.h $(top_builddir)include/bits/semaphore.h \
 		$(top_builddir)include/bits/libc-lock.h $(top_builddir)include/bits/stdio-lock
+# note to sjhill: the clean target shouldn't depend on PTNAME/PTDIR
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 	$(RM)	$(PTNAME)/version.h $(PTDIR)/banner.h \
 		$(PTDIR)/sysdeps/unix/sysv/linux/rtld-libc-lowlevellock.c




More information about the uClibc-cvs mailing list