diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2005-08-16 06:45:17 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2005-08-16 06:45:17 +0000 |
| commit | 0f9ffd69231e26d707c585d9a3884b95d244232d (patch) | |
| tree | 6aa2e7cf3b2dddb5dc52a06ab32493270543dcaf /tethereal.c | |
| parent | bc35e184c794f2539a33ca8c179650356f1bd480 (diff) | |
Move SVNVERSION handling into version_info. That way, we won't have
to recompile tethereal.o etc each time the svn version has changed,
relinking is sufficient.
I'm not sure what to do about mergecap, as it currently doesn't link
against version_info, so it's "overhead" either way.
svn path=/trunk/; revision=15371
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tethereal.c b/tethereal.c index bb8c608800..92595f3275 100644 --- a/tethereal.c +++ b/tethereal.c @@ -59,8 +59,6 @@ #include "getopt.h" #endif -#include "svnversion.h" - #include <glib.h> #include <epan/epan.h> #include <epan/filesystem.h> @@ -220,14 +218,11 @@ print_usage(gboolean print_ver) if (print_ver) { output = stdout; - fprintf(output, "This is GNU t" PACKAGE " " VERSION -#ifdef SVNVERSION - " (" SVNVERSION ")" -#endif + fprintf(output, "This is GNU t" PACKAGE " " VERSION "%s" "\n (C) 1998-2005 Gerald Combs <gerald@ethereal.com>" "\n%s\n%s\n", - comp_info_str->str, runtime_info_str->str); + svnversion, comp_info_str->str, runtime_info_str->str); } else { output = stderr; } @@ -1000,12 +995,8 @@ main(int argc, char *argv[]) } break; case 'v': /* Show version and exit */ - printf("t" PACKAGE " " VERSION -#ifdef SVNVERSION - " (" SVNVERSION ")" -#endif - "\n%s\n%s\n", - comp_info_str->str, runtime_info_str->str); + printf("t" PACKAGE " " VERSION "%s\n%s\n%s\n", + svnversion, comp_info_str->str, runtime_info_str->str); exit(0); break; case 'w': /* Write to capture file xxx */ |