svn commit: trunk/uClibc: ldso/ldso libc libc/misc/internals

[psm at uclibc.org]

Author: psm
Date: 2005-11-18 14:20:49 -0800 (Fri, 18 Nov 2005)
New Revision: 12409

Log:
make -j2 works here

Modified:
   trunk/uClibc/Makerules
   trunk/uClibc/ldso/ldso/Makefile.in
   trunk/uClibc/libc/Makefile.in
   trunk/uClibc/libc/misc/internals/Makefile.in


Changeset:
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules	2005-11-18 20:37:59 UTC (rev 12408)
+++ trunk/uClibc/Makerules	2005-11-18 22:20:49 UTC (rev 12409)
@@ -32,11 +32,11 @@
 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)),)

Modified: trunk/uClibc/ldso/ldso/Makefile.in
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile.in	2005-11-18 20:37:59 UTC (rev 12408)
+++ trunk/uClibc/ldso/ldso/Makefile.in	2005-11-18 22:20:49 UTC (rev 12409)
@@ -62,9 +62,8 @@
 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) $@

Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in	2005-11-18 20:37:59 UTC (rev 12408)
+++ trunk/uClibc/libc/Makefile.in	2005-11-18 22:20:49 UTC (rev 12409)
@@ -45,7 +45,7 @@
 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" > $@

Modified: trunk/uClibc/libc/misc/internals/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/internals/Makefile.in	2005-11-18 20:37:59 UTC (rev 12408)
+++ trunk/uClibc/libc/misc/internals/Makefile.in	2005-11-18 22:20:49 UTC (rev 12409)
@@ -16,7 +16,7 @@
 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__" >> $@