Update.

2004-10-17  Ulrich Drepper  <drepper@redhat.com>

	* sunrpc/rpc_clntout.c: Avoid including rcsid into binary.
	* sunrpc/rpc_cout.c: Likewise.
	* sunrpc/rpc_hout.c: Likewise.
	* sunrpc/rpc_main.c: Likewise.
	* sunrpc/rpc_parse.c: Likewise.
	* sunrpc/rpc_sample.c: Likewise.
	* sunrpc/rpc_scan.c: Likewise.
	* sunrpc/rpc_svcout.c: Likewise.
	* sunrpc/rpc_tblout.c: Likewise.
	* sunrpc/rpc_util.c: Likewise.

10 files changed, 30 insertions, 10 deletions

diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c
index 1e6bb56728..4e2832ff56 100644
--- a/sunrpc/rpc_clntout.c
+++ b/sunrpc/rpc_clntout.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI
  */
-char clntout_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char clntout_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c
index a6471ab335..a803feb65a 100644
--- a/sunrpc/rpc_cout.c
+++ b/sunrpc/rpc_cout.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI
  */
-char cout_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char cout_rcsid[] =
 "$Id$";
+#endif
 
 /*
  * rpc_cout.c, XDR routine outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c
index 076d63cb12..38cb419527 100644
--- a/sunrpc/rpc_hout.c
+++ b/sunrpc/rpc_hout.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI
  */
-char hout_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char hout_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
index 656f8ae502..fee83514d1 100644
--- a/sunrpc/rpc_main.c
+++ b/sunrpc/rpc_main.c
@@ -31,8 +31,10 @@
 /*
  * From @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI;
  */
-const char main_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char main_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_main.c, Top level of the RPC protocol compiler.
diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
index d6eda42309..7115cbdd08 100644
--- a/sunrpc/rpc_parse.c
+++ b/sunrpc/rpc_parse.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI
  */
-const char parse_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char parse_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_parse.c, Parser for the RPC protocol compiler
diff --git a/sunrpc/rpc_sample.c b/sunrpc/rpc_sample.c
index 79214a6a83..50c3d5554b 100644
--- a/sunrpc/rpc_sample.c
+++ b/sunrpc/rpc_sample.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI
  */
-char sample_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char sample_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_scan.c b/sunrpc/rpc_scan.c
index 15c8e01178..d6211e9105 100644
--- a/sunrpc/rpc_scan.c
+++ b/sunrpc/rpc_scan.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI
  */
-char scan_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char scan_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_scan.c, Scanner for the RPC protocol compiler
diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c
index a1eb792097..9a807c4096 100644
--- a/sunrpc/rpc_svcout.c
+++ b/sunrpc/rpc_svcout.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI
  */
-char svcout_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char svcout_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_tblout.c b/sunrpc/rpc_tblout.c
index 4f62e2e7fd..bf4037fc37 100644
--- a/sunrpc/rpc_tblout.c
+++ b/sunrpc/rpc_tblout.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI
  */
-char tblout_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char tblout_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
diff --git a/sunrpc/rpc_util.c b/sunrpc/rpc_util.c
index 4c986040ce..31e1d3143c 100644
--- a/sunrpc/rpc_util.c
+++ b/sunrpc/rpc_util.c
@@ -31,8 +31,10 @@
 /*
  * From: @(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI
  */
-char util_rcsid[] =
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char util_rcsid[] =
   "$Id$";
+#endif
 
 /*
  * rpc_util.c, Utility routines for the RPC protocol compiler