[git commit nptl] generate nptl headers without a recursive make call
Austin Foxley
austinf at cetoncorp.com
Fri Nov 27 09:03:24 UTC 2009
commit: http://git.uclibc.org/uClibc/commit/?id=2218a91b0effd50e0d15f1c5ff90d503640bf842
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
Makefile.in | 9 +--------
libpthread/nptl/Makefile.in | 2 ++
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0e0091f..90cb631 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 571b1f3..9b4ba51 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
--
1.6.3.3
More information about the uClibc-cvs
mailing list