diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | Makerules | 5 | ||||
| -rw-r--r-- | ldso/ldso/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/misc/internals/Makefile.in | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 74f1799c8..ec999cb1b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,6 @@ else export header_extra_args = -n endif headers: include/bits/uClibc_config.h -ifeq ($(wildcard include/headers_done),) @$(SHELL_SET_X); \ $(top_srcdir)extra/scripts/fix_includes.sh \ -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \ @@ -94,8 +93,6 @@ ifeq ($(wildcard include/headers_done),) mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \ fi $(MAKE) headers-y - touch include/headers_done -endif # Command used to download source code WGET:=wget --passive-ftp @@ -129,7 +126,6 @@ install_headers: fi ; \ tar -chf - include --exclude .svn $$extra_exclude \ | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) - $(RM) $(PREFIX)$(DEVEL_PREFIX)include/headers_done $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ssp-internal.h $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h ifneq ($(UCLIBC_HAS_FLOATS),y) @@ -321,7 +317,7 @@ clean: @$(RM) -r lib include/bits $(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a $(RM) libc/misc/internals/interp.c - $(RM) include/fpu_control.h include/dl-osinfo.h include/headers_done + $(RM) include/fpu_control.h include/dl-osinfo.h $(MAKE) -C extra/locale clean $(MAKE) headers_clean-y $(MAKE) -C test clean @@ -34,10 +34,7 @@ interp-y: $(interp) pre-y: interp-y ld-uClibc-y libc-y: pre-y $(libc) crt-y $(top_builddir)lib/$(NONSHARED_LIBNAME) lib-so-y: libc-y $(lib-so-y) -lib-a-y: $(top_builddir)include/headers_done crt-y $(lib-a-y) - -$(top_builddir)include/headers_done: - @cd $(top_builddir); $(MAKE) headers +lib-a-y: crt-y $(lib-a-y) ifneq ($(findstring s,$(MAKEFLAGS)),) DISP := sil diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index aa126b9d1..8e6c432bf 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -58,7 +58,7 @@ ld-uClibc-so-y := $(ld-uClibc_OBJS:.o=.os) ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)) objclean-y += ld-uClibc_clean -$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(top_builddir)include/headers_done +$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION)) $(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y) diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in index 8863aba7b..7e03205d2 100644 --- a/libc/misc/internals/Makefile.in +++ b/libc/misc/internals/Makefile.in @@ -16,7 +16,7 @@ MISC_INTERNALS_OUT:=$(top_builddir)libc/misc/internals MISC_INTERNALS_SRC:=$(patsubst %.c,$(MISC_INTERNALS_DIR)/%.c,$(CSRC)) MISC_INTERNALS_OBJ:=$(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC)) -$(MISC_INTERNALS_OUT)/interp.c: $(top_builddir)include/headers_done +$(MISC_INTERNALS_OUT)/interp.c: $(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@ $(Q)echo "#include <features.h>" >> $@ $(Q)echo "#ifdef __HAVE_ELF__" >> $@ |