summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makerules6
-rw-r--r--ldso/ldso/Makefile.in3
-rw-r--r--libc/Makefile.in2
-rw-r--r--libc/misc/internals/Makefile.in2
4 files changed, 6 insertions, 7 deletions
diff --git a/Makerules b/Makerules
index b5fc779da..281afe7a3 100644
--- a/Makerules
+++ b/Makerules
@@ -32,11 +32,11 @@ headers-y: $(headers-y)
ld-uClibc-y: $(ld-uClibc-y)
interp-y: $(interp)
pre-y: interp-y ld-uClibc-y
-libc-y: pre-y $(libc) crt-y
-lib-a-y: headers_root crt-y $(lib-a-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)
-headers_root:
+$(top_builddir)include/headers_done:
@cd $(top_builddir); $(MAKE) headers
ifneq ($(findstring s,$(MAKEFLAGS)),)
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 78979f020..c01c7f066 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -62,9 +62,8 @@ objclean-y += ld-uClibc_clean
headers-$(HAVE_SHARED) += ldso_headers
headers_clean-y += ldso_headers_clean
-$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a headers_root
+$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(top_builddir)include/headers_done
$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
- #(RM) $@
$(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y)
$(Q)$(RM) $@
diff --git a/libc/Makefile.in b/libc/Makefile.in
index 50201d4fd..f65121c00 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -45,7 +45,7 @@ lib-a-y += $(top_builddir)lib/libc.a crt-y
lib-so-y += libc-y $(top_builddir)lib/$(NONSHARED_LIBNAME) crt-y
objclean-y += libc_clean
-$(top_builddir)lib/libc.so: $(libc_OUT)/libc_so.a pre-y
+$(top_builddir)lib/libc.so: $(libc_OUT)/libc_so.a $(top_builddir)include/headers_done $(interp)
$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
$(Q)$(RM) $@
$(Q)echo "/* GNU ld script" > $@
diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in
index bfae764e4..8863aba7b 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: headers_root
+$(MISC_INTERNALS_OUT)/interp.c: $(top_builddir)include/headers_done
$(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@
$(Q)echo "#include <features.h>" >> $@
$(Q)echo "#ifdef __HAVE_ELF__" >> $@