From 641e7e36ad0a9b2899b04f256c5b243ada7da279 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Wed, 9 Dec 2009 14:51:45 -0800 Subject: nptl: make build depend directly on nptl headers gets rid of nptl_headers,nptl_arch_headers,nptl_linux_headers targets also, clean up extra slashes in i386/sparc and unify the implementation of nptl header generation between all archs Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/arm/Makefile.arch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libpthread/nptl/sysdeps/arm/Makefile.arch') diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch index 6d16ae3fd..79c883260 100644 --- a/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/libpthread/nptl/sysdeps/arm/Makefile.arch @@ -43,7 +43,8 @@ librt-so-y += $(LIBRT_ARCH_OBJ:.o=.oS) libpthread-nomulti-y += $(PTHREAD_ARCH_OBJ) -objclean-y += nptl_arch_objclean +objclean-y += nptl_arch_clean +headers-y += $(PTHREAD_ARCH_OUT)/tcb-offsets.h headers_clean-y += nptl_arch_headers_clean # @@ -57,13 +58,11 @@ $(PTHREAD_ARCH_OUT)/tcb-offsets.c: $(PTHREAD_ARCH_DIR)/tcb-offsets.sym $(PTHREAD_ARCH_OUT)/tcb-offsets.s: $(PTHREAD_ARCH_OUT)/tcb-offsets.c $(compile.c) -nptl_arch_headers: $(PTHREAD_ARCH_OUT)/tcb-offsets.s - $(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $(PTHREAD_ARCH_OUT)/tcb-offsets.h +$(PTHREAD_ARCH_OUT)/tcb-offsets.h: $(PTHREAD_ARCH_OUT)/tcb-offsets.s + $(do_sed) -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$\/#define \1 \2/p" $< > $@ 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) -- cgit v1.2.3