diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 3716b94d3..1dafc1ab3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,6 @@ noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \ include $(top_srcdir)Rules.mak sub_headers := headers - ifndef KCONFIG_CONFIG KCONFIG_CONFIG := $(top_builddir).config endif @@ -114,7 +113,8 @@ target-headers-sysdep := \ $(ALL_HEADERS_BITS_ARCH) \ $(ALL_HEADERS_BITS_SUBARCH) \ $(ALL_HEADERS_SYS_COMMON) \ - $(ALL_HEADERS_SYS_ARCH) + $(ALL_HEADERS_SYS_ARCH) \ + $(ALL_HEADERS_BITS_PTHREAD) $(top_builddir)include/fpu_control.h: @$(disp_ln) @@ -157,11 +157,14 @@ headers_clean-y += HEADERCLEAN_common # libc/sysdeps/linux/Makefile.commonarch to headers-y headers-y += $(target-headers-sysdep) -headers: $(top_builddir)include/bits/uClibc_config.h +headers: $(top_builddir)include/bits/uClibc_config.h $(top_builddir)include/bits/sysnum.h subdirs: $(addprefix $(top_builddir),$(subdirs)) -pregen: $(top_builddir)include/bits/sysnum.h headers subdirs - -$(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh | $(top_builddir)include/bits +pregen-headers: headers + $(Q)$(MAKE) $(pregen-headers-y) +pregen: pregen-headers subdirs + $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers) +$(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh + $(Q)$(INSTALL) -d $(@D) @$(disp_gen) $(Q)set -e; \ tmp=`mktemp $(top_builddir)include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \ @@ -307,14 +310,14 @@ install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)$(MULTILI ifeq ($(HAVE_SHARED),y) for i in `cd $(top_builddir) && find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ $(SED) -e 's/lib\///'` ; do \ - $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \ + $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(ABI_VERSION) \ $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/$$i; \ done ifeq ($(HARDWIRED_ABSPATH),y) - if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME) ] ; then \ $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)$(MULTILIB_DIR)/$(NONSHARED_LIBNAME):' \ - -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME):' \ + -e 's:$(SHARED_LIBNAME):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME):' \ -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO):' \ $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ fi @@ -324,10 +327,10 @@ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifneq ($(LINUXTHREADS_OLD),y) ifeq ($(HARDWIRED_ABSPATH),y) - if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) ] ; then \ + if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(ABI_VERSION) ] ; then \ $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ - echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread_nonshared.a )" \ + echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(ABI_VERSION) $(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread_nonshared.a )" \ >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ fi else |