svn commit: branches/uClibc-nptl: librt

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-05 18:38:36 -0800 (Mon, 05 Dec 2005)
New Revision: 12680

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/Makefile.in
   branches/uClibc-nptl/librt/Makefile.in


Changeset:
Modified: branches/uClibc-nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/Makefile.in	2005-12-06 02:37:23 UTC (rev 12679)
+++ branches/uClibc-nptl/Makefile.in	2005-12-06 02:38:36 UTC (rev 12680)
@@ -27,9 +27,9 @@
 include $(top_srcdir)libm/Makefile.in
 include $(top_srcdir)libnsl/Makefile.in
 include $(top_srcdir)libresolv/Makefile.in
-include $(top_srcdir)librt/Makefile.in
 include $(top_srcdir)libutil/Makefile.in
 include $(top_srcdir)libpthread/Makefile.in
+include $(top_srcdir)librt/Makefile.in
 include $(top_srcdir)extra/locale/Makefile.in
 
 # last included to catch all the objects added by others (locales/threads)

Modified: branches/uClibc-nptl/librt/Makefile.in
===================================================================
--- branches/uClibc-nptl/librt/Makefile.in	2005-12-06 02:37:23 UTC (rev 12679)
+++ branches/uClibc-nptl/librt/Makefile.in	2005-12-06 02:38:36 UTC (rev 12680)
@@ -20,11 +20,11 @@
 librt_OBJ := $(patsubst $(librt_DIR)/%.c,$(librt_OUT)/%.o,$(librt_SRC))
 
 ifeq ($(DOPIC),y)
-librt-a-y := $(librt_OBJ:.o=.os)
+librt-a-y += $(librt_OBJ:.o=.os)
 else
-librt-a-y := $(librt_OBJ)
+librt-a-y += $(librt_OBJ)
 endif
-librt-so-y := $(librt_OBJ:.o=.os)
+librt-so-y += $(librt_OBJ:.o=.os)
 
 librt-multi-y += $(librt_SRC)