svn commit: trunk/uClibc

psm at uclibc.org psm at uclibc.org
Tue Nov 22 22:03:53 UTC 2005


Author: psm
Date: 2005-11-22 14:03:52 -0800 (Tue, 22 Nov 2005)
New Revision: 12482

Log:
Make objs target work again

Modified:
   trunk/uClibc/Makerules


Changeset:
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules	2005-11-22 21:46:30 UTC (rev 12481)
+++ trunk/uClibc/Makerules	2005-11-22 22:03:52 UTC (rev 12482)
@@ -8,19 +8,27 @@
 ifeq ($(HAVE_SHARED),y)
 .LIBPATTERNS: "lib%.so"
 libs: $(lib-so-y) $(lib-a-y)
-objs: $(sort $(shared_objs) $(ar_objs))
 else
 .LIBPATTERNS: "lib%.a"
 libs: $(lib-a-y)
-objs: $(ar_objs)
 endif
+objs: all_objs
 
-shared_objs =  $(lduClibc-so-y) $(libc-so-y) $(libc-nonshared-y) $(libdl-so-y)
+shared_objs =  $(ld-uClibc-so-y) $(libc-so-y) $(libc-nonshared-y) $(libdl-so-y)
 shared_objs += $(libcrypt-so-y) $(libintl-so-y) $(libm-so-y) $(libnsl-so-y) $(libpthread-so-y)
 shared_objs += $(libresolv-so-y) $(librt-so-y) $(libutil-so-y)
 ar_objs =  $(libc-a-y) $(libcrypt-a-y) $(libintl-a-y) $(libm-a-y) $(libnsl-a-y)
 ar_objs += $(libpthread-a-y) $(libresolv-a-y) $(librt-a-y) $(libutil-a-y)
+ifeq ($(DOPIC),y)
+ar_objs := $(ar_objs:.o=.os)
+endif
 
+ifeq ($(HAVE_SHARED),y)
+all_objs: $(sort $(shared_objs) $(ar_objs))
+else
+all_objs: $(ar_objs)
+endif
+
 headers-y: $(headers-y)
 
 ifneq ($(findstring s,$(MAKEFLAGS)),)




More information about the uClibc-cvs mailing list