From ae042e99cffce562d8595fc884302c4326228b44 Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Sat, 4 Jul 2009 16:15:26 -0700 Subject: [PATCH] Remove version.h; we generate version.c these days. --- src/http.c | 8 ++++---- src/main.c | 8 +++----- src/version.h | 35 ----------------------------------- 3 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 src/version.h diff --git a/src/http.c b/src/http.c index 4e49ed4f..974951a1 100644 --- a/src/http.c +++ b/src/http.c @@ -66,12 +66,12 @@ as that of the covered work. */ #include "test.h" #endif -#include "version.h" - #ifdef __VMS # include "vms.h" #endif /* def __VMS */ +extern char *version_string; + /* Forward decls. */ struct http_stat; static char *create_authorization_line (const char *, const char *, @@ -1350,7 +1350,7 @@ free_hstat (struct http_stat *hs) if (!opt.useragent) \ request_set_header (req, "User-Agent", \ aprintf ("Wget/%s (VMS %s %s)", \ - VERSION_STRING, vms_arch(), vms_vers()), \ + version_string, vms_arch(), vms_vers()), \ rel_value); \ else if (*opt.useragent) \ request_set_header (req, "User-Agent", opt.useragent, rel_none); \ @@ -1360,7 +1360,7 @@ free_hstat (struct http_stat *hs) if (!opt.useragent) \ request_set_header (req, "User-Agent", \ aprintf ("Wget/%s (%s)", \ - VERSION_STRING, OS_TYPE), \ + version_string, OS_TYPE), \ rel_value); \ else if (*opt.useragent) \ request_set_header (req, "User-Agent", opt.useragent, rel_none); \ diff --git a/src/main.c b/src/main.c index 366047fe..713b240a 100644 --- a/src/main.c +++ b/src/main.c @@ -63,8 +63,6 @@ as that of the covered work. */ #include "vms.h" #endif /* __VMS */ -#include "version.h" - #ifndef PATH_SEPARATOR # define PATH_SEPARATOR '/' #endif @@ -681,7 +679,7 @@ Recursive accept/reject:\n"), size_t i; printf (_("GNU Wget %s, a non-interactive network retriever.\n"), - VERSION_STRING); + version_string); print_usage (); for (i = 0; i < countof (help); i++) @@ -782,7 +780,7 @@ print_version (void) #ifdef __VMS printf ("GNU Wget %s built on VMS %s %s.\n\n", - VERSION_STRING, vms_arch(), vms_vers()); + version_string, vms_arch(), vms_vers()); #else /* def __VMS */ printf ("GNU Wget %s built on %s.\n\n", version_string, OS_TYPE); #endif /* def __VMS */ @@ -1152,7 +1150,7 @@ for details.\n\n")); log_init (opt.lfilename, append_to_log); DEBUGP (("DEBUG output created by Wget %s on %s.\n\n", - VERSION_STRING, OS_TYPE)); + version_string, OS_TYPE)); /* Open the output filename if necessary. */ diff --git a/src/version.h b/src/version.h deleted file mode 100644 index a7073b6f..00000000 --- a/src/version.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Program version - Copyright (C) 2008 Free Software Foundation, Inc. - -This file is part of GNU Wget. - -GNU Wget is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -GNU Wget is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Wget. If not, see . - -Additional permission under GNU GPL version 3 section 7 - -If you modify this program, or any covered work, by linking or -combining it with the OpenSSL project's OpenSSL library (or a -modified version of that library), containing parts covered by the -terms of the OpenSSL or SSLeay licenses, the Free Software Foundation -grants you additional permission to convey the resulting work. -Corresponding Source for a non-source form of such a combination -shall include the source code for the parts of OpenSSL used as well -as that of the covered work. */ - -#ifndef VERSION_H -#define VERSION_H - -#define VERSION_STRING "1.11a" - -#endif /* def VERSION_H */ -- 2.39.2