Don't include version.h.

(main): Use PACKAGE_VERSION instead of version_string.
This commit is contained in:
Jim Meyering
1996-03-16 22:30:54 +00:00
parent 688833b80e
commit 4229a555fc
24 changed files with 25 additions and 49 deletions
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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;
+2 -3
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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 ();
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}
+1 -2
View File
@@ -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);
}