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/unix/sysv/linux/Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in index 563b6c1cc..01b2cdd8a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in @@ -139,6 +139,10 @@ librt-a-y += $(LIBRT_LINUX_OBJ) librt-so-y += $(LIBRT_LINUX_OBJ:.o=.oS) objclean-y += nptl_linux_clean +headers-y += $(PTHREAD_LINUX_OUT)/lowlevelbarrier.h \ + $(PTHREAD_LINUX_OUT)/lowlevelcond.h \ + $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h \ + $(PTHREAD_LINUX_OUT)/unwindbuf.h headers_clean-y += nptl_linux_headers_clean # @@ -185,11 +189,6 @@ $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h: $(PTHREAD_LINUX_OUT)/lowlevelrwlock.s $(PTHREAD_LINUX_OUT)/unwindbuf.h: $(PTHREAD_LINUX_OUT)/unwindbuf.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_linux_headers: $(PTHREAD_LINUX_OUT)/lowlevelbarrier.h \ - $(PTHREAD_LINUX_OUT)/lowlevelcond.h \ - $(PTHREAD_LINUX_OUT)/lowlevelrwlock.h \ - $(PTHREAD_LINUX_OUT)/unwindbuf.h - HEADERS_BITS_PTHREAD := $(notdir $(wildcard $(PTHREAD_LINUX_DIR)/bits/*.h)) ALL_HEADERS_BITS_PTHREAD := $(addprefix include/bits/,$(HEADERS_BITS_PTHREAD)) -- cgit v1.2.3