Use standard build rule to build rpcgen.

diff --git a/ChangeLog b/ChangeLog
index b95bb9d..dbc58e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-10  Joseph Myers  <joseph@codesourcery.com>
+
+       * sunrpc/Makefile (others): Add rpcgen.
+       ($(objpfx)rpcgen): Remove special build rule and dependency on
+       libc.
+       * sunrpc/rpcgen.c: New file.
+
 2012-03-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        [BZ #13673]

diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index 329d3f3..e0339ad 100644 (file)
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -86,6 +86,7 @@ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
              rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \
              rpc_tblout.o rpc_sample.o
 extra-objs = $(rpcgen-objs)
+others += rpcgen
 
 all: # Make this the default target; it will be defined in Rules.
 
@@ -149,10 +150,7 @@ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
 
-$(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
-  $(sort $(filter $(common-objpfx)libc%,$(link-libc))) \
-  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
-       $(+link)
+$(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs))
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.
 cpp-srcs-left := $(rpcgen-objs:.o=.c)

diff --git a/sunrpc/rpcgen.c b/sunrpc/rpcgen.c
new file mode 100644 (file)
index 0000000..1b455ba
--- /dev/null
+++ b/sunrpc/rpcgen.c
@@ -0,0 +1,2 @@
+/* Empty file expected by glibc's standard build rules for
+   executables.  */