From 2218a91b0effd50e0d15f1c5ff90d503640bf842 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Sun, 29 Nov 2009 16:18:49 -0800 Subject: generate nptl headers without a recursive make call Signed-off-by: Austin Foxley --- Makefile.in | 9 +-------- libpthread/nptl/Makefile.in | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0e0091f6d..90cb63159 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,15 +160,8 @@ headers-y += $(target-headers-sysdep) headers: $(top_builddir)include/bits/uClibc_config.h subdirs: $(addprefix $(top_builddir),$(subdirs)) -pregen: $(top_builddir)include/bits/sysnum.h headers subdirs +pregen: $(top_builddir)include/bits/sysnum.h headers subdirs $(pthread_pregen) $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers) -ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) - $(Q)$(MAKE) nptl_headers -ifeq ($(shell $(CC) --help 2>&1 > /dev/null && echo yes),yes) - $(Q)$(MAKE) nptl_arch_headers - $(Q)$(MAKE) nptl_linux_headers -endif -endif $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh $(Q)$(INSTALL) -d $(@D) diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 571b1f388..9b4ba512b 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -261,6 +261,8 @@ headers_clean-y += nptl_headers_clean -include $(PTHREAD_DIR)/sysdeps/unix/sysv/linux/Makefile.in -include $(PTHREAD_DIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/Makefile.arch +pthread_pregen := nptl_headers nptl_arch_headers nptl_linux_headers + lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so -- cgit v1.2.3