diff options
| -rw-r--r-- | libpthread/nptl/Makefile.in | 10 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/Makefile.in | 6 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/pthread/Makefile.in | 6 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/sh/Makefile.arch | 10 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in | 16 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/sh/Makefile.arch | 6 | ||||
| -rw-r--r-- | libpthread/nptl_db/Makefile.in | 8 |
7 files changed, 31 insertions, 31 deletions
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 48ca3412d..c44173026 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -296,7 +296,7 @@ $(PTHREAD_OUT)/pthread-errnos.h: $(PTHREAD_OUT)/pthread-errnos.s @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)/banner.h: $(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) 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) diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in index 0b1ac3b87..cec58b280 100644 --- a/libpthread/nptl_db/Makefile.in +++ b/libpthread/nptl_db/Makefile.in @@ -36,7 +36,7 @@ libthread_db-multi-y := $(libthread_db_SRC) 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 @@ $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) 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) |