Browse Source

make -j2 works here

Peter S. Mazinger 18 years ago
parent
commit
235373b727
4 changed files with 6 additions and 7 deletions
  1. 3 3
      Makerules
  2. 1 2
      ldso/ldso/Makefile.in
  3. 1 1
      libc/Makefile.in
  4. 1 1
      libc/misc/internals/Makefile.in

+ 3 - 3
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)),)

+ 1 - 2
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) $@

+ 1 - 1
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" > $@

+ 1 - 1
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__" >> $@