Don't include version.h.

(main): Use PACKAGE_VERSION instead of version_string.

diff --git a/src/cat.c b/src/cat.c
index 31eada9d7e32c1cecb6b610d47fc50ac8321fafc..390abc4f95e56f508ff429c851e431e5a343aac9 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -31,7 +31,6 @@
 #include <sys/ioctl.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
@@ -580,7 +579,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cat - %s\n", version_string);
+      printf ("cat - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/cksum.c b/src/cksum.c
index c3f3a8119339e39c5aa0e5390c7ca7b31c7081d8..d5b29ef963a5efc9ce76f63de2eee17f6c93e742 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -108,7 +108,6 @@ main ()
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Number of bytes to read at once.  */
@@ -307,7 +306,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cksum - %s\n", version_string);
+      printf ("cksum - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/comm.c b/src/comm.c
index e9db88874713cc3f493aa5d7cc4b87ccea12f5d4..a1b1f46220b913cb9415c07bb859447dea288142 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include "system.h"
 #include "linebuffer.h"
-#include "version.h"
 #include "error.h"
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
@@ -250,7 +249,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("comm - %s\n", version_string);
+      printf ("comm - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/csplit.c b/src/csplit.c
index 508eadc77c51c09751569365ff1a038e6d6fc36e..5045c7cb8b3b061b63f1c4f7d629c57fb75f9cb7 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -42,7 +42,6 @@
 # include <rx.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtoul.h"
 
@@ -1490,7 +1489,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("csplit - %s\n", version_string);
+      printf ("csplit - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/cut.c b/src/cut.c
index d50ec71c9a4c6852290d8df1657b17a475624bcc..a6ecdab396a204e6761240d03e6963f96e8b737a 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -72,7 +72,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #define FATAL_ERROR(s)                                                 \
@@ -737,7 +736,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("cut - %s\n", version_string);
+      printf ("cut - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/expand.c b/src/expand.c
index 93ddee4769cc3e1d564015332e608c7f87dee96c..d77d1c8faf5a3de0a2404a16e93a23ee9164dd34 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -42,7 +42,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* The number of bytes added at a time to the amount of memory
@@ -368,7 +367,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("expand - %s\n", version_string);
+      printf ("expand - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/fmt.c b/src/fmt.c
index faf975bc77fd74cbcd18fd7806d6b9b8c26d81d2..dc03b7aa2358f730560b6459c536b1a7dd9ff00a 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -40,7 +40,6 @@
 #define word unused_word_type
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -398,7 +397,7 @@ main (register int argc, register char **argv)
 
   if (show_version)
     {
-      printf ("fmt - %s\n", version_string);
+      printf ("fmt - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/fold.c b/src/fold.c
index a23b637c85dec613eceac897c195e3921e9363c9..747f7868414a43af11f022e2196ab194cd950a2a 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -39,7 +39,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "xstrtol.h"
 #include "error.h"
 
@@ -309,7 +308,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("fold - %s\n", version_string);
+      printf ("fold - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/head.c b/src/head.c
index a0415801e6a11239bfa5b301e21b27261127a985..244d9a81306bf223c3965c1851151b58575e0b1b 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -30,7 +30,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Number of lines/chars/blocks to head. */
@@ -353,7 +352,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("head - %s\n", version_string);
+      printf ("head - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/join.c b/src/join.c
index e9c5bb14519d6b56c50ca534fe7336e7ab9ce947..360684a6528666278fc2f0c1327540eabf295cd8 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -61,7 +61,6 @@ char *alloca ();
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "xstrtol.h"
 #include "error.h"
@@ -782,7 +781,7 @@ main (int argc, char **argv)
      it may be increased.  */
   uni_blank.nfields = 1;
 
-  parse_long_options (argc, argv, "join", version_string, usage);
+  parse_long_options (argc, argv, "join", PACKAGE_VERSION, usage);
 
   nfiles = 0;
   print_pairables = 1;

diff --git a/src/md5sum.c b/src/md5sum.c
index 2e2759d0f66a816afbf6357aa382e02e9e6f798a..07ad35488f0ee7bf06c19b2a29e479b5e385cc5e 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -31,7 +31,6 @@
 #include "getline.h"
 #include "system.h"
 #include "error.h"
-#include "version.h"
 
 /* Most systems do not distinguish between external and internal
    text representations.  */
@@ -403,7 +402,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "md5sum", version_string, usage);
+  parse_long_options (argc, argv, "md5sum", PACKAGE_VERSION, usage);
 
   while ((opt = getopt_long (argc, argv, "bctw", long_options, NULL))
         != EOF)
@@ -444,7 +443,7 @@ main (int argc, char **argv)
 
   if (do_version)
     {
-      printf ("md5sum - %s\n", version_string);
+      printf ("md5sum - %s\n", PACKAGE_VERSION);
       exit (EXIT_SUCCESS);
     }
 

diff --git a/src/nl.c b/src/nl.c
index 0ac34979c91b7668fee47b13f02a6c10196b560f..0450bda6abf7e64baefdf30a97cf1582efc98aaf 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -44,7 +44,6 @@
 
 #include "linebuffer.h"
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -578,7 +577,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("nl - %s\n", version_string);
+      printf ("nl - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/od.c b/src/od.c
index 8cca7b9b8a2ac443aaee5bf9d9de1a0058ac5cc1..fb3303900ecbe5b04341739532b625617427f965 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -44,7 +44,6 @@ char *alloca ();
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "xstrtoul.h"
 #include "error.h"
 
@@ -1758,7 +1757,7 @@ the maximum\nrepresentable value of type off_t"), optarg);
 
   if (show_version)
     {
-      printf ("od - %s\n", version_string);
+      printf ("od - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/paste.c b/src/paste.c
index 395c6bcaff87d404430011ce78dc754d2b3aa56b..7ac478731f1671ca3f224e672b3c1031f08e6656 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -44,7 +44,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -473,7 +472,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("paste - %s\n", version_string);
+      printf ("paste - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/pr.c b/src/pr.c
index be9356daedae710004da3e04e0bee4ecb12895b2..954876e7a3f62c472f546693ddc02223665ab8b8 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -101,7 +101,6 @@
 #include <sys/types.h>
 #include <time.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 char *xmalloc ();
@@ -617,7 +616,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pr - %s\n", version_string);
+      printf ("pr - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/sort.c b/src/sort.c
index 8e272329815af7bae32ac7d13983b70f2ccc18e9..c1c6dc5ef44a24917016c2b4cbb785723e78d62d 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -28,7 +28,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include "system.h"
-#include "version.h"
 #include "long-options.h"
 #include "error.h"
 #include "xstrtod.h"
@@ -1678,7 +1677,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "sort", version_string, usage);
+  parse_long_options (argc, argv, "sort", PACKAGE_VERSION, usage);
 
   have_read_stdin = 0;
   inittables ();

diff --git a/src/split.c b/src/split.c
index bdc89e5519dddaa40c22f2101e0ffac6cafc4819..fb6ec4e507f9d8998da211f600063d4d1c8dcb4d 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -40,7 +40,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -454,7 +453,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("split - %s\n", version_string);
+      printf ("split - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/sum.c b/src/sum.c
index df22ff897336c7b37bd8b9ee7ab8bc969670e4ac..bf04e6233cd85bcddd5b63b0dac24f3b26a412a1 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <getopt.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 int safe_read ();
@@ -235,7 +234,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sum - %s\n", version_string);
+      printf ("sum - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/tac.c b/src/tac.c
index 54c10d0b4db073dad7b697c2ab10c0e0ee1db3a8..88c688a74e46fe748a1f2d8fead7584463dad1aa 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -47,7 +47,6 @@ tac -r -s '.\|
 # include <rx.h>
 #endif
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef STDC_HEADERS
@@ -622,7 +621,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tac - %s\n", version_string);
+      printf ("tac - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/tail.c b/src/tail.c
index c4c80caf3de41dac774f57aec473b1e7b3f3f4ba..5ec27fce3964e57f1e84f486b4e27ad89f1c1743 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -51,7 +51,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "version.h"
 #include "xstrtol.h"
 #include "error.h"
 
@@ -970,7 +969,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tail - %s\n", version_string);
+      printf ("tail - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/tr.c b/src/tr.c
index 2a97d8157d643de73cd3c85e4f9f8b837cdde2e9..d00860777678c7be97718c4e85d0bf3b5ad9572e 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -34,7 +34,6 @@
 #endif
 
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 #ifndef ULONG_MAX
@@ -1832,7 +1831,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tr - %s\n", version_string);
+      printf ("tr - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/unexpand.c b/src/unexpand.c
index 0d09594746111f16857639fff89b136ea8aa15a0..dddd5776175eaf0a7ae21fe934a6bf1053697539 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -44,7 +44,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* The number of bytes added at a time to the amount of memory
@@ -425,7 +424,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("unexpand - %s\n", version_string);
+      printf ("unexpand - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/uniq.c b/src/uniq.c
index d6900cefff89dc0161295a42eddd2c4839b3dc74..2ba1aa403e98255df8f1b5eb6270aaa96f75e3d7 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -40,7 +40,6 @@
 
 #include "system.h"
 #include "linebuffer.h"
-#include "version.h"
 #include "error.h"
 #include "xstrtol.h"
 
@@ -363,7 +362,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uniq - %s\n", version_string);
+      printf ("uniq - %s\n", PACKAGE_VERSION);
       exit (0);
     }
 

diff --git a/src/wc.c b/src/wc.c
index 27db2a436dcf1c7e5676997ab3dfc906224a2a48..10875887abeb35aadf48f2631a6d8eabfb02f347 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -24,7 +24,6 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include "system.h"
-#include "version.h"
 #include "error.h"
 
 /* Size of atomic reads. */
@@ -293,7 +292,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("wc - %s\n", version_string);
+      printf ("wc - %s\n", PACKAGE_VERSION);
       exit (0);
     }