From a63e523a5ee5599ce83fe7a964fa69d25d5d04ac Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Sun, 25 Apr 2010 20:38:19 +0200 Subject: nptl: Harmonize objects and headers makefile clean targets Update all the nptl clean targets (both objects and headers) to use the new syntax using CLEAN_ and HEADER_. Signed-off-by: Carmelo Amoroso --- libpthread/nptl/Makefile.in | 8 ++++---- libpthread/nptl/sysdeps/generic/Makefile.in | 4 ++-- libpthread/nptl/sysdeps/i386/Makefile.arch | 8 ++++---- libpthread/nptl/sysdeps/pthread/Makefile.in | 4 ++-- libpthread/nptl/sysdeps/sh/Makefile.arch | 8 ++++---- libpthread/nptl/sysdeps/sparc/Makefile.arch | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in | 8 ++++---- libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch | 4 ++-- libpthread/nptl/sysdeps/x86_64/Makefile.arch | 8 ++++---- 12 files changed, 34 insertions(+), 34 deletions(-) (limited to 'libpthread/nptl') diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 1e9f98cea..9d3e393c0 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -261,8 +261,8 @@ endif libpthread-so-y := $(patsubst $(PTHREAD_DIR)/%.c,$(PTHREAD_OUT)/%.oS,$(libpthread_so_SRC)) libpthread-static-y += $(patsubst $(PTHREAD_DIR)/%.c,$(PTHREAD_OUT)/%.o,$(libpthread_a_SRC) $(libpthread_static_SRC)) -objclean-y += libpthread_clean -headers_clean-y += nptl_headers_clean +objclean-y += CLEAN_libpthread/nptl +headers_clean-y += HEADERCLEAN_libpthread/nptl -include $(PTHREAD_DIR)/sysdeps/generic/Makefile.in -include $(PTHREAD_DIR)/sysdeps/pthread/Makefile.in @@ -333,9 +333,9 @@ nptl_headers_bootstrap := $(top_builddir)include/pthread.h \ $(top_builddir)include/bits/stdio-lock.h -nptl_headers_clean: +CLEAN_libpthread/nptl: $(do_rm) $(nptl_headers_bootstrap) \ $(addprefix $(PTHREAD_OUT)/pthread-errnos., c h s) -libpthread_clean: +HEADERCLEAN_libpthread/nptl: $(do_rm) $(addprefix $(PTHREAD_OUT)/*., o os oS a) diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in index 1079a5fd9..5276e3574 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+=nptl_pthread_generic_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/generic -nptl_pthread_generic_clean: +CLEAN_libpthread/nptl/sysdeps/generic: $(do_rm) $(addprefix $(PTHREAD_GENERIC_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch index e2bb2efd8..bc0117489 100644 --- a/libpthread/nptl/sysdeps/i386/Makefile.arch +++ b/libpthread/nptl/sysdeps/i386/Makefile.arch @@ -27,8 +27,8 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS) libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ) -objclean-y += nptl_arch_clean -headers_clean-y += nptl_arch_headers_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/i386 +headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/i386 # # Create 'tcb-offsets.h' header file. @@ -46,8 +46,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(PTHREAD_ARCH_OUT)/tcb-offsets.h -nptl_arch_headers_clean: +HEADERCLEAN_libpthread/nptl/sysdeps/i386: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h) -nptl_arch_clean: +CLEAN_libpthread/nptl/sysdeps/i386: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index 2a94e4315..000d18b1d 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -155,9 +155,9 @@ $(pthread_DIR)/pt-sigfillset.c: $(pthread_DIR)/pt-sigprocmask.c: $(LN) -s sigprocmask.c $@ -objclean-y += nptl_pthread_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/pthread -nptl_pthread_clean: +CLEAN_libpthread/nptl/sysdeps/pthread: $(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 541901cc0..5c36a7992 100644 --- a/libpthread/nptl/sysdeps/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/sh/Makefile.arch @@ -30,8 +30,8 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS) libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ) -objclean-y += nptl_arch_clean -headers_clean-y += nptl_arch_headers_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/sh +headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/sh # # Create 'tcb-offsets.h' header file. @@ -49,8 +49,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(PTHREAD_ARCH_OUT)/tcb-offsets.h -nptl_arch_headers_clean: +HEADERCLEAN_libpthread/nptl/sysdeps/sh: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h) -nptl_arch_clean: +CLEAN_libpthread/nptl/sysdeps/sh: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch index 632b75b4f..b9b1c9cfd 100644 --- a/libpthread/nptl/sysdeps/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch @@ -27,8 +27,8 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS) libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ) -objclean-y += nptl_arch_clean -headers_clean-y += nptl_arch_headers_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/sparc +headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/sparc # # Create 'tcb-offsets.h' header file. diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in index ac642f272..1c75c14c5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in @@ -141,8 +141,8 @@ 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_clean -headers_clean-y += nptl_linux_headers_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux +headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/unix/sysv/linux # # Create header files. @@ -235,7 +235,7 @@ 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_clean: +HEADERCLEAN_libpthread/nptl/sysdeps/unix/sysv/linux: $(do_rm) $(addprefix $(PTHREAD_LINUX_OUT)/gen_lowlevelbarrier., c s) \ $(addprefix $(PTHREAD_LINUX_OUT)/gen_lowlevelcond., c s) \ $(addprefix $(PTHREAD_LINUX_OUT)/gen_lowlevelrwlock., c s) \ @@ -252,5 +252,5 @@ nptl_linux_headers_clean: $(PTHREAD_LINUX_OUT)/pthread-pi-defines.h -nptl_linux_clean: +CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux: $(do_rm) $(addprefix $(PTHREAD_LINUX_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch index 570aa560e..8bd5492dc 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch @@ -65,7 +65,7 @@ libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS) libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ) -objclean-y+=nptl_linux_arch_clean +objclean-y+=CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/i386 -nptl_linux_arch_clean: +CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/i386: $(do_rm) $(addprefix $(LINUX_ARCH_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 940bd62f8..187ad5e1a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch @@ -79,7 +79,7 @@ libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS) libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ) -objclean-y+=nptl_linux_arch_clean +objclean-y+=CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/sh -nptl_linux_arch_clean: +CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/sh: $(do_rm) $(addprefix $(LINUX_ARCH_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch index 1e4f54488..0e19fa59d 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/Makefile.arch @@ -61,7 +61,7 @@ libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS) libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ) -objclean-y+=nptl_linux_arch_clean +objclean-y+=CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/sparc -nptl_linux_arch_clean: +CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/sparc: $(do_rm) $(addprefix $(LINUX_ARCH_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch index 53a87728f..d59df2c4a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile.arch @@ -72,7 +72,7 @@ libc-shared-y+=$(LIBC_LINUX_ARCH_OBJ:.o=.oS) libc-nomulti-y+=$(LIBC_LINUX_ARCH_OBJ) -objclean-y+=nptl_linux_arch_clean +objclean-y+=CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/x86_64 -nptl_linux_arch_clean: +CLEAN_libpthread/nptl/sysdeps/unix/sysv/linux/x86_64: $(do_rm) $(addprefix $(LINUX_ARCH_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/x86_64/Makefile.arch b/libpthread/nptl/sysdeps/x86_64/Makefile.arch index 8ba9e9ed4..6dca0f70c 100644 --- a/libpthread/nptl/sysdeps/x86_64/Makefile.arch +++ b/libpthread/nptl/sysdeps/x86_64/Makefile.arch @@ -27,8 +27,8 @@ libpthread-so-y += $(PTHREAD_ARCH_OBJ:.o=.oS) libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ) -objclean-y += nptl_arch_clean -headers_clean-y += nptl_arch_headers_clean +objclean-y += CLEAN_libpthread/nptl/sysdeps/x86_64 +headers_clean-y += HEADERCLEAN_libpthread/nptl/sysdeps/x86_64 # # Create 'tcb-offsets.h' header file. @@ -46,8 +46,8 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(PTHREAD_ARCH_OUT)/tcb-offsets.h -nptl_arch_headers_clean: +HEADERCLEAN_libpthread/nptl/sysdeps/x86_64: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/tcb-offsets., c s h) -nptl_arch_clean: +CLEAN_libpthread/nptl/sysdeps/x86_84: $(do_rm) $(addprefix $(PTHREAD_ARCH_OUT)/*., o os oS) -- cgit v1.2.3