Browse Source

generate nptl headers without a recursive make call

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Austin Foxley 14 years ago
parent
commit
2218a91b0e
2 changed files with 3 additions and 8 deletions
  1. 1 8
      Makefile.in
  2. 2 0
      libpthread/nptl/Makefile.in

+ 1 - 8
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)

+ 2 - 0
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