svn commit: branches/uClibc-nptl/libpthread: nptl nptl/sysdeps/generic nptl/sysdeps/p etc...

carmelo at uclibc.org carmelo at uclibc.org
Wed Dec 3 17:53:18 UTC 2008


Author: carmelo
Date: 2008-12-03 09:53:17 -0800 (Wed, 03 Dec 2008)
New Revision: 24246

Log:
Rework nptl build system for cleaning headers and objects
to be compliant with all other Makefile.
The output of the make clean (silent mode) will be as follows:

 CLEAN ld-uClibc
  CLEAN libdl
<....>
  CLEAN nptl_pthread_generic
  CLEAN nptl_pthread
  CLEAN nptl_arch
  CLEAN nptl_linux
  CLEAN nptl_linux_arch
  CLEAN libthread_db
<....>
  CLEAN nptl_headers
  CLEAN nptl_arch_headers
  CLEAN nptl_linux_headers
  CLEAN nptl_db_headers

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>


Modified:
   branches/uClibc-nptl/libpthread/nptl/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/Makefile.arch
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch
   branches/uClibc-nptl/libpthread/nptl_db/Makefile.in


Changeset:
Modified: branches/uClibc-nptl/libpthread/nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/Makefile.in	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/Makefile.in	2008-12-03 17:53:17 UTC (rev 24246)
@@ -296,7 +296,7 @@
 	@sed -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@
 
 
-headers-$(UCLIBC_HAS_THREADS_NATIVE) += nptl_headers_bootstrap
+headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(nptl_headers_bootstrap)
 
 include/pthread.h:
 	$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
@@ -315,16 +315,16 @@
 $(PTDIR)/version.h:
 	@echo "#define VERSION \""$(VERSION)"\"" > $(PTDIR)/version.h
 
-nptl_headers_bootstrap: include/pthread.h include/semaphore.h include/bits/semaphore.h include/bits/pthreadtypes.h \
+nptl_headers_bootstrap:= include/pthread.h include/semaphore.h include/bits/semaphore.h include/bits/pthreadtypes.h \
 						include/bits/libc-lock.h include/bits/stdio-lock.h \
 						$(PTDIR)/banner.h $(PTDIR)/version.h
 
 nptl_headers: $(PTHREAD_OUT)/pthread-errnos.h
 
 nptl_headers_clean:
-	$(RM) $(PTDIR)/banner.h $(top_builddir)include/pthread.h	\
-	      $(PTDIR)/version.h $(top_builddir)include/semaphore.h	\
+	$(do_rm) $(addprefix $(top_builddir),$(nptl_headers_bootstrap)) \
 	      $(PTHREAD_OUT)/pthread-errnos.{c,h,s}
 
+
 libpthread_clean:
-	$(RM) $(PTHREAD_OUT)/*.{o,os,oS,a}
+	$(do_rm)  $(addprefix $(PTHREAD_OUT)/*., o os oS a)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/Makefile.in	2008-12-03 17:53:17 UTC (rev 24246)
@@ -24,7 +24,7 @@
 
 libc-nomulti-y+=$(LIBC_GENERIC_OBJ)
 
-objclean-y+=pthread_generic_objclean
+objclean-y+=nptl_pthread_generic_clean
 
-pthread_generic_objclean:
-	$(RM) $(PTHREAD_GENERIC_OUT)/*.{o,os,oS}
+nptl_pthread_generic_clean:
+	$(do_rm) $(addprefix $(PTHREAD_GENERIC_OUT)/*., o os oS)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/Makefile.in	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/Makefile.in	2008-12-03 17:53:17 UTC (rev 24246)
@@ -128,9 +128,9 @@
 $(pthread_DIR)/pt-sigprocmask.c:
 	$(LN) -s sigprocmask.c $@
 
-objclean-y += pthread_objclean
+objclean-y += nptl_pthread_clean
 
-pthread_objclean:
-	$(RM) $(pthread_OUT)/*.{o,os,oS,s,S} $(pthread_OUT)/defs.h \
+nptl_pthread_clean:
+	$(do_rm) $(addprefix $(pthread_OUT)/*., o os oS s S) $(pthread_OUT)/defs.h \
 	      $(pthread_DIR)/pt-sigaction.c $(pthread_DIR)/pt-sigfillset.c \
 	      $(pthread_DIR)/pt-sigprocmask.c

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/Makefile.arch
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/Makefile.arch	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/sh/Makefile.arch	2008-12-03 17:53:17 UTC (rev 24246)
@@ -26,7 +26,7 @@
 
 libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ)
 
-objclean-y += nptl_arch_objclean
+objclean-y += nptl_arch_clean
 headers_clean-y += nptl_arch_headers_clean
 
 #
@@ -46,9 +46,7 @@
 nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.h
 
 nptl_arch_headers_clean:
-	$(RM) $(PTHREAD_ARCH_OUT)/tcb-offsets.c		\
-	      $(PTHREAD_ARCH_OUT)/tcb-offsets.s		\
-	      $(PTHREAD_ARCH_OUT)/tcb-offsets.h
+	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h)
 
-nptl_arch_objclean:
-	$(RM) $(PTHREAD_ARCH_OUT)/*.{o,os,oS}
+nptl_arch_clean:
+	$(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in	2008-12-03 17:53:17 UTC (rev 24246)
@@ -130,7 +130,7 @@
 librt-a-y += $(LIBRT_LINUX_OBJ)
 librt-so-y += $(LIBRT_LINUX_OBJ:.o=.oS)
 
-objclean-y += nptl_linux_objclean
+objclean-y += nptl_linux_clean
 headers_clean-y += nptl_linux_headers_clean
 
 #
@@ -188,11 +188,13 @@
 $(ALL_HEADERS_BITS_PTHREAD):
 	$(do_ln) ../../$(PTHREAD_LINUX_DIR)/bits/$(@F) $(top_builddir)$@
 	
+nptl_linux_headers_all:= $(PTHREAD_LINUX_OUT)/lowlevelbarrier.{c,h,s}	\
+	$(PTHREAD_LINUX_OUT)/lowlevelcond.{c,h,s}		\
+	$(PTHREAD_LINUX_OUT)/lowlevelrwlock.{c,h,s}	\
+	$(PTHREAD_LINUX_OUT)/unwindbuf.{c,h,s}
+
 nptl_linux_headers_clean:
-	$(RM) $(PTHREAD_LINUX_OUT)/lowlevelbarrier.{c,h,s}	\
-	$(RM) $(PTHREAD_LINUX_OUT)/lowlevelcond.{c,h,s}		\
-	$(RM) $(PTHREAD_LINUX_OUT)/lowlevelrwlock.{c,h,s}	\
-	$(RM) $(PTHREAD_LINUX_OUT)/unwindbuf.{c,h,s}
+	$(do_rm) $(nptl_linux_headers_all)
 
-nptl_linux_objclean:
-	$(RM) $(PTHREAD_LINUX_OUT)/*.{o,os,oS}
+nptl_linux_clean:
+	$(do_rm) $(addprefix $(PTHREAD_LINUX_OUT)/*., o os oS)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch	2008-12-03 17:53:17 UTC (rev 24246)
@@ -74,7 +74,7 @@
 
 libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ)
 
-objclean-y+=pthread_linux_arch_objclean
+objclean-y+=nptl_linux_arch_clean
 
-pthread_linux_arch_objclean:
-	$(RM) $(LINUX_ARCH_OUT)/*.{o,os,oS}
+nptl_linux_arch_clean:
+	$(do_rm) $(addprefix $(LINUX_ARCH_OUT)/*., o os oS)

Modified: branches/uClibc-nptl/libpthread/nptl_db/Makefile.in
===================================================================
--- branches/uClibc-nptl/libpthread/nptl_db/Makefile.in	2008-12-03 14:07:45 UTC (rev 24245)
+++ branches/uClibc-nptl/libpthread/nptl_db/Makefile.in	2008-12-03 17:53:17 UTC (rev 24246)
@@ -36,7 +36,7 @@
 lib-a-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.a
 lib-so-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.so
 objclean-y += libthread_db_clean
-headers-$(PTHREADS_DEBUG_SUPPORT) += nptl_db_headers
+headers-$(PTHREADS_DEBUG_SUPPORT) += $(nptl_db_headers)
 headers_clean-y += nptl_db_headers_clean
 
 ifeq ($(DOPIC),y)
@@ -60,10 +60,10 @@
 include/thread_db.h:
 	$(do_ln) ../$(PTDIR)_db/$(@F) $(top_builddir)$@
 
-nptl_db_headers: include/thread_db.h
+nptl_db_headers:= include/thread_db.h
 
 nptl_db_headers_clean:
-	$(RM) $(top_builddir)include/thread_db.h
+	$(do_rm) $(addprefix $(top_builddir),$(nptl_db_headers))
 
 libthread_db_clean:
-	$(RM) $(libthread_db_OUT)/*.{o,oS,a}
+	$(do_rm) $(addprefix $(libthread_db_OUT)/*., o oS a)




More information about the uClibc-cvs mailing list