Simplify lib-src version printing

* lib-src/Makefile.in (etags_cflags): Remove.
All uses replaced by a simple ‘-o $@’.
(ebrowse${EXEEXT}, emacsclient${EXEEXT}, emacsclientw${EXEEXT}):
Omit -DVERSION= option.
* lib-src/ebrowse.c (VERSION):
* lib-src/emacsclient.c (VERSION):
* lib-src/etags.c (EMACS_NAME, VERSION): Remove.
All uses replaced by PACKAGE_NAME and PACKAGE_VERSION.
* lib-src/ebrowse.c (version):
* lib-src/etags.c (print_version):
Use fputs to output the version info, since that’s fputs_unlocked.
* lib-src/etags.c (PROGRAM_NAME): New macro.
(print_version): Use it.
This commit is contained in:
Paul Eggert 2019-06-20 08:56:22 -07:00
parent de4e1bddb1
commit b6af27927c
4 changed files with 19 additions and 34 deletions

View file

@ -84,10 +84,6 @@ char *w32_getenv (const char *);
#include <min-max.h>
#include <unlocked-io.h>
#ifndef VERSION
#define VERSION "unspecified"
#endif
/* Work around GCC bug 88251. */
#if GNUC_PREREQ (7, 0, 0)
# pragma GCC diagnostic ignored "-Wformat-truncation=2"
@ -546,7 +542,7 @@ decode_options (int argc, char **argv)
break;
case 'V':
message (false, "emacsclient %s\n", VERSION);
message (false, "emacsclient %s\n", PACKAGE_VERSION);
exit (EXIT_SUCCESS);
break;