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@st.com>

5 files changed, 22 insertions, 22 deletions

diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in
index 87115570d..1079a5fd9 100644
--- a/libpthread/nptl/sysdeps/generic/Makefile.in
+++ b/libpthread/nptl/sysdeps/generic/Makefile.in
@@ -24,7 +24,7 @@ libc-static-y+=$(LIBC_GENERIC_OBJ)
 
 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)
diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
index 59076006d..0c3b52f9d 100644
--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
+++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
@@ -128,9 +128,9 @@ $(pthread_DIR)/pt-sigfillset.c:
 $(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
diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch
index 84385bd36..c108d6965 100644
--- a/libpthread/nptl/sysdeps/sh/Makefile.arch
+++ b/libpthread/nptl/sysdeps/sh/Makefile.arch
@@ -26,7 +26,7 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS)
 
 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 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s
 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)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
index 00e33486f..865d15113 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in
@@ -130,7 +130,7 @@ LIBRT_LINUX_OBJ := $(patsubst %.c,$(PTHREAD_LINUX_OUT)/%.o,$(librt_CSRC))
 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 := $(addprefix include/bits/,$(HEADERS_BITS_PTHREAD))
 $(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)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch
index add1cfc03..2fbf2b171 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch
@@ -74,7 +74,7 @@ libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS)
 
 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)