[commits] r13547 - in /fsf/trunk/libc: ChangeLog sunrpc/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Apr 21 00:55:53 2011
New Revision: 13547

Log:
Import glibc-mainline for 2011-04-21

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sunrpc/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Apr 21 00:55:53 2011
@@ -1,3 +1,7 @@
+2011-04-20  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* sunrpc/Makefile: Move inclusion of Rules.
+
 2011-04-19  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* nss/nss_files/files-initgroups.c: New file.

Modified: fsf/trunk/libc/sunrpc/Makefile
==============================================================================
--- fsf/trunk/libc/sunrpc/Makefile (original)
+++ fsf/trunk/libc/sunrpc/Makefile Thu Apr 21 00:55:53 2011
@@ -116,6 +116,8 @@
 omit-deps = $(librpcsvc-routines)
 endif
 
+include ../Rules
+
 ifeq (yes,$(build-shared))
 rpc-compat-routines = $(addprefix compat-,$(need-export-routines))
 rpc-compat-routines.os = $(addprefix $(objpfx), \
@@ -148,8 +150,6 @@
 
 CPPFLAGS += -D_RPC_THREAD_SAFE_
 
-include ../Rules
-
 $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so