From 6039fd0faf73c9d6c5b2abf9d824734218ec5eee Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 24 Jan 2012 16:46:55 +0100 Subject: Update to putty 9388 --- tools/plink/version.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'tools/plink/version.c') diff --git a/tools/plink/version.c b/tools/plink/version.c index bcb233272..16347ca19 100644 --- a/tools/plink/version.c +++ b/tools/plink/version.c @@ -5,7 +5,21 @@ #define STR1(x) #x #define STR(x) STR1(x) -#define SVN_REV 9080 +#ifdef INCLUDE_EMPTY_H +/* + * Horrible hack to force version.o to be rebuilt unconditionally in + * the automake world: empty.h is an empty header file, created by the + * makefile and forcibly updated every time make is run. Including it + * here causes automake to track it as a dependency, which will cause + * version.o to be rebuilt too. + * + * The space between # and include causes mkfiles.pl's dependency + * scanner (for all other makefile types) to ignore this include, + * which is correct because only the automake makefile passes + * -DINCLUDE_EMPTY_H to enable it. + */ +# include "empty.h" +#endif #if defined SNAPSHOT @@ -25,6 +39,11 @@ char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT; char ver[] = "Release " STR(RELEASE); char sshver[] = "PuTTY-Release-" STR(RELEASE); +#elif defined PRERELEASE + +char ver[] = "Pre-release " STR(PRERELEASE) ":r" STR(SVN_REV); +char sshver[] = "PuTTY-Prerelease-" STR(PRERELEASE) ":r" STR(SVN_REV); + #elif defined SVN_REV char ver[] = "Custom build r" STR(SVN_REV) ", " __DATE__ " " __TIME__; -- cgit v1.2.3