--- ChangeLog | 5 +++++ build-aux/build_info.pl | 1 + src/ChangeLog | 5 +++++ src/main.c | 2 -- src/version.h | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 5c45b0c..e7dbd6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-22 Darshit Shah <[email protected]> + + * build-aux/build_info.pl: Include version.h in the final C file generated + by the script. + 2014-11-20 Darshit Shah <[email protected]> * configure.ac: Change option to --enable-assert. Assertions are disabled by diff --git a/build-aux/build_info.pl b/build-aux/build_info.pl index 67aeab1..f346d3d 100755 --- a/build-aux/build_info.pl +++ b/build-aux/build_info.pl @@ -137,3 +137,4 @@ __DATA__ #include "wget.h" #include <stdio.h> +#include "version.h" diff --git a/src/ChangeLog b/src/ChangeLog index e912cf9..3d29d3d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2014-11-22 Darshit Shah <[email protected]> + * version.h: Add extern for compilation_string + * main: Remove declaration for compilation_String + +2014-11-22 Darshit Shah <[email protected]> + * version.h: New file. Add extern declarations for globally shared strings * Makefile.am: Have version.c import version.h * main.c: Import version.h and remove old extern declarations diff --git a/src/main.c b/src/main.c index 56f3312..6f5adf7 100644 --- a/src/main.c +++ b/src/main.c @@ -81,8 +81,6 @@ struct options opt; /* defined in version.c */ extern char *system_getrc; -/* defined in build_info.c */ -extern const char *compiled_features[]; /* Used for --version output in print_version */ #define MAX_CHARS_PER_LINE 72 #define TABULATION 4 diff --git a/src/version.h b/src/version.h index 487f73f..32ab531 100644 --- a/src/version.h +++ b/src/version.h @@ -31,3 +31,6 @@ as that of the covered work. */ extern const char *version_string; extern const char *compilation_string; extern const char *link_string; + +/* Extern declaration for string in build_info.c */ +extern const char *compiled_features[]; -- 2.1.3
