diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-02-23 16:12:52 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-02-23 16:12:52 +0000 |
| commit | fc60101a9fe5685861bd92c96eaab9e70ed42109 (patch) | |
| tree | df3bc2c34e09ebfd219bacd48aceea1b61cc6a49 | |
| parent | 75456a5bbe74a592b4cc5c2e7d70ff1847698dc1 (diff) | |
| download | wireshark-fc60101a9fe5685861bd92c96eaab9e70ed42109.tar.gz | |
Move cvsversion.h from BUILT_INCLUDES to BUILT_SOURCES. This tells automake
to create cvsversion.h before any "all" or "check" targets are built.
Clean up a few CVS version strings that I missed last week.
svn path=/trunk/; revision=10199
| -rw-r--r-- | Makefile.common | 7 | ||||
| -rw-r--r-- | gtk/main.c | 6 | ||||
| -rw-r--r-- | tethereal.c | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common index 926c02184a..bc9ab194a5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.21 2004/02/22 23:40:28 guy Exp $ +# $Id: Makefile.common,v 1.22 2004/02/23 16:12:51 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -687,9 +687,12 @@ DISSECTOR_SUPPORT_INCLUDES = \ xdlc.h \ xmlstub.h +# "BUILT_SOURCES" are built before any "make all" or "make check" targets. +BUILT_SOURCES = \ + cvsversion.h + # headers needed for the generation process BUILT_INCLUDES = \ - cvsversion.h \ x11-declarations.h \ x11-register-info.h diff --git a/gtk/main.c b/gtk/main.c index 07b60e7f53..0416b73ef7 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.405 2004/02/22 21:35:58 ulfl Exp $ + * $Id: main.c,v 1.406 2004/02/23 16:12:52 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1376,7 +1376,7 @@ print_usage(gboolean print_ver) { output = stdout; fprintf(output, "This is GNU " PACKAGE " " VERSION #ifdef CVSVERSION - " (cvs " CVSVERSION ")" + " (" CVSVERSION ")" #endif "\n%s\n%s\n", comp_info_str->str, runtime_info_str->str); @@ -1413,7 +1413,7 @@ show_version(void) printf(PACKAGE " " VERSION #ifdef CVSVERSION - " (cvs " CVSVERSION ")" + " (" CVSVERSION ")" #endif "\n%s\n%s\n", comp_info_str->str, runtime_info_str->str); diff --git a/tethereal.c b/tethereal.c index 8e03b4d041..2e5776ecca 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.230 2004/02/21 02:15:06 guy Exp $ + * $Id: tethereal.c,v 1.231 2004/02/23 16:12:51 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -244,7 +244,7 @@ print_usage(gboolean print_ver) output = stdout; fprintf(output, "This is GNU t" PACKAGE " " VERSION #ifdef CVSVERSION - " (cvs " CVSVERSION ")" + " (" CVSVERSION ")" #endif "\n (C) 1998-2004 Gerald Combs <gerald@ethereal.com>" "\n%s\n%s\n", |