svn commit: trunk/uClibc: libc

[psm at uclibc.org]

Author: psm
Date: 2005-11-24 17:08:42 -0800 (Thu, 24 Nov 2005)
New Revision: 12519

Log:
Build libc if in a subdir and we have it as a dependency

Modified:
   trunk/uClibc/Makerules
   trunk/uClibc/Rules.mak
   trunk/uClibc/libc/Makefile.in


Changeset:
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules	2005-11-25 00:55:21 UTC (rev 12518)
+++ trunk/uClibc/Makerules	2005-11-25 01:08:42 UTC (rev 12519)
@@ -141,6 +141,9 @@
 $(ldso):
 	cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@))
 
+$(libc):
+	cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@))
+
 #ifeq ($(HAVE_ELF),y)
 CRT=crt1
 #else

Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-11-25 00:55:21 UTC (rev 12518)
+++ trunk/uClibc/Rules.mak	2005-11-25 01:08:42 UTC (rev 12519)
@@ -60,12 +60,12 @@
 SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
 UCLIBC_LDSO := ld-uClibc.so.$(MAJOR_VERSION)
 NONSHARED_LIBNAME := uclibc_nonshared.a
-libc := $(top_builddir)lib/$(LIBC).so
+libc := $(top_builddir)lib/$(SHARED_MAJORNAME)
 interp := $(top_builddir)lib/interp.os
 ldso := $(top_builddir)lib/$(UCLIBC_LDSO)
 
 #LIBS :=$(interp) -L$(top_builddir)lib -lc
-LIBS := $(interp) -L$(top_builddir)lib $(libc)
+LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(MAJOR_VERSION)=)
 
 # Make sure DESTDIR and PREFIX can be used to install
 # PREFIX is a uClibcism while DESTDIR is a common GNUism

Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in	2005-11-25 00:55:21 UTC (rev 12518)
+++ trunk/uClibc/libc/Makefile.in	2005-11-25 01:08:42 UTC (rev 12519)
@@ -49,7 +49,7 @@
 lib-so-y += $(libc)
 objclean-y += libc_clean
 
-$(libc): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
+$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
 	$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
 	$(Q)$(RM) $@
 	$(Q)echo "/* GNU ld script" > $@