Don't include version.h.

(main): Use PACKAGE_VERSION instead of version_string.

26 files changed, 27 insertions, 53 deletions

diff --git a/src/basename.c b/src/basename.c
index 9a9ca0cbd..1a63ef0ea 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -93,7 +92,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "basename", version_string, usage);
+  parse_long_options (argc, argv, "basename", PACKAGE_VERSION, usage);
 
   if (argc == 1 || argc > 3)
     {
diff --git a/src/date.c b/src/date.c
index 7b0c456c3..0f7d35220 100644
--- a/src/date.c
+++ b/src/date.c
@@ -22,7 +22,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 
-#include "version.h"
 #include "system.h"
 #include "getline.h"
 #include "error.h"
@@ -199,7 +198,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("date - %s\n", version_string);
+      printf ("date - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/dirname.c b/src/dirname.c
index 82eca2229..86d943eaa 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -66,7 +65,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "dirname", version_string, usage);
+  parse_long_options (argc, argv, "dirname", PACKAGE_VERSION, usage);
 
   if (argc != 2)
     {
diff --git a/src/echo.c b/src/echo.c
index 3f31a444b..5b2064cf4 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -21,7 +21,6 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 
 /* echo [-neE] [arg ...]
@@ -111,7 +110,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "echo", version_string, usage);
+  parse_long_options (argc, argv, "echo", PACKAGE_VERSION, usage);
 
 /* System V machines already have a /bin/sh with a v9 behaviour.  We
    use the identical behaviour for these machines so that the
diff --git a/src/env.c b/src/env.c
index 24ad743de..2f5534d31 100644
--- a/src/env.c
+++ b/src/env.c
@@ -83,7 +83,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -141,7 +140,7 @@ main (register int argc, register char **argv, char **envp)
 
   if (show_version)
     {
-      printf ("env - %s\n", version_string);
+      printf ("env - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/expr.c b/src/expr.c
index 3376a6dfd..4fc074910 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -34,7 +34,6 @@
 #include <regex.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -159,7 +158,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "expr", version_string, usage);
+  parse_long_options (argc, argv, "expr", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     {
diff --git a/src/factor.c b/src/factor.c
index 11251244c..0706dff69 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -39,7 +39,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtoul.h"
@@ -178,7 +177,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "factor", version_string, usage);
+  parse_long_options (argc, argv, "factor", PACKAGE_VERSION, usage);
 
   fail = 0;
   if (argc == 1)
diff --git a/src/hostname.c b/src/hostname.c
index 239dba08c..83d72279e 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -83,7 +82,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "hostname", version_string, usage);
+  parse_long_options (argc, argv, "hostname", PACKAGE_VERSION, usage);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)
diff --git a/src/id.c b/src/id.c
index a03ba6e68..d85a620c1 100644
--- a/src/id.c
+++ b/src/id.c
@@ -26,7 +26,6 @@
 #include <grp.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -134,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("id - %s\n", version_string);
+      printf ("id - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/logname.c b/src/logname.c
index 9d71c751e..82e5735e3 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 
 /* The name this program was run with. */
@@ -83,7 +82,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("logname - %s\n", version_string);
+      printf ("logname - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/nice.c b/src/nice.c
index 579a206be..c4f5b0a60 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -30,7 +30,6 @@
 #include <sys/resource.h>
 #endif
 
-#include "version.h"
 #include "system.h"
 #include "long-options.h"
 #include "error.h"
@@ -68,7 +67,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "nice", version_string, usage);
+  parse_long_options (argc, argv, "nice", PACKAGE_VERSION, usage);
 
   for (optind = 1; optind < argc; /* empty */)
     {
diff --git a/src/pathchk.c b/src/pathchk.c
index ddb44ef24..224d517c3 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -43,7 +43,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -143,7 +142,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pathchk - %s\n", version_string);
+      printf ("pathchk - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/printenv.c b/src/printenv.c
index 6bc45c1fa..fbdca726d 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -101,7 +100,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("printenv - %s\n", version_string);
+      printf ("printenv - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/printf.c b/src/printf.c
index 7c5f338a9..d71a30470 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -49,7 +49,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -138,7 +137,7 @@ main (int argc, char **argv)
 
   exit_status = 0;
 
-  parse_long_options (argc, argv, "printf", version_string, usage);
+  parse_long_options (argc, argv, "printf", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     {
diff --git a/src/pwd.c b/src/pwd.c
index c61c19438..6a4ab4496 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 
@@ -60,7 +59,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "pwd", version_string, usage);
+  parse_long_options (argc, argv, "pwd", PACKAGE_VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring non-option arguments"));
diff --git a/src/seq.c b/src/seq.c
index cdfcd6da3..323f5d7c5 100644
--- a/src/seq.c
+++ b/src/seq.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "error.h"
-#include "version.h"
 
 static double scan_double_arg __P ((char *arg));
 static int check_format __P ((char *format_string));
@@ -151,7 +150,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      (void) printf ("seq - %s\n", version_string);
+      (void) printf ("seq - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/sleep.c b/src/sleep.c
index b37e94393..e417ead9c 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 #include "error.h"
 
@@ -87,7 +86,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sleep - %s\n", version_string);
+      printf ("sleep - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/stty.c b/src/stty.c
index e18e34bb3..c2cbc4ebf 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -48,7 +48,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtol.h"
@@ -654,7 +653,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "stty", version_string, usage);
+  parse_long_options (argc, argv, "stty", PACKAGE_VERSION, usage);
 
   output_type = changed;
   verbose_output = 0;
diff --git a/src/su.c b/src/su.c
index 25168fc14..81c9adba0 100644
--- a/src/su.c
+++ b/src/su.c
@@ -113,7 +113,6 @@ uid_t getuid ();
 #include <shadow.h>
 #endif
 
-#include "version.h"
 #include "error.h"
 
 /* The default PATH for simulated logins to non-superuser accounts.  */
@@ -239,7 +238,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("su - %s\n", version_string);
+      printf ("su - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/tee.c b/src/tee.c
index 95018ddb7..2914638d8 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -114,7 +113,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tee - %s\n", version_string);
+      printf ("tee - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/test.c b/src/test.c
index face6a5b2..076bef711 100644
--- a/src/test.c
+++ b/src/test.c
@@ -36,7 +36,6 @@
 #  include "filecntl.h"
 #else /* TEST_STANDALONE */
 #  include "system.h"
-#  include "version.h"
 #  include "group-member.h"
 #  include "error.h"
 #  if !defined (S_IXUGO)
@@ -1074,7 +1073,7 @@ main (int margc, char **margv)
 
   if (margv[0] && strcmp (margv[0], "[") == 0)
     {
-      parse_long_options (argc, argv, COMMAND_NAME, version_string, usage);
+      parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
 
       --margc;
 
@@ -1091,7 +1090,7 @@ main (int margc, char **margv)
   if (pos >= argc)
     test_exit (SHELL_BOOLEAN (FALSE));
 
-  parse_long_options (argc, argv, COMMAND_NAME, version_string, usage);
+  parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
   value = posixtest ();
 
   if (pos != argc)
diff --git a/src/tty.c b/src/tty.c
index 26c293bb7..cc42023a2 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 static void usage __P ((int status));
@@ -85,7 +84,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tty - %s\n", version_string);
+      printf ("tty - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/uname.c b/src/uname.c
index e64af98ed..a34ef65a3 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -35,7 +35,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 static void print_element __P ((unsigned int mask, char *element));
@@ -134,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uname - %s\n", version_string);
+      printf ("uname - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/who-users.c b/src/who-users.c
index 2313e4bb5..2418e3c3f 100644
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -51,7 +51,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #if !defined (UTMP_FILE) && defined (_PATH_UTMP)	/* 4.4BSD.  */
@@ -623,7 +622,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s - %s\n", COMMAND_NAME, version_string);
+      printf ("%s - %s\n", COMMAND_NAME, PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/whoami.c b/src/whoami.c
index 0bd3cddde..2e2c56819 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -24,7 +24,6 @@
 #include <pwd.h>
 #include <getopt.h>
 
-#include "version.h"
 #include "system.h"
 
 /* The name this program was run with. */
@@ -88,7 +87,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("whoami - %s\n", version_string);
+      printf ("whoami - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 
diff --git a/src/yes.c b/src/yes.c
index 58a06d6a6..02ded1274 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -23,7 +23,6 @@
 
 #include "system.h"
 #include "long-options.h"
-#include "version.h"
 
 /* The name this program was run with. */
 char *program_name;
@@ -54,7 +53,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "yes", version_string, usage);
+  parse_long_options (argc, argv, "yes", PACKAGE_VERSION, usage);
 
   if (argc == 1)
     while (1)