X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=version.c;h=f6086127e662159bfc5e462466bd8e44a4addd4b;hb=9dd9860cc84f82309de64c33e2813c6e9dc60749;hp=2ed4832e65f79f46cb462b434778eaf162443f1a;hpb=1dff23a2143b7a6ce1084a6308569d14c2826240;p=PuTTY.git

diff --git a/version.c b/version.c
index 2ed4832e..f6086127 100644
--- a/version.c
+++ b/version.c
@@ -2,59 +2,16 @@
  * PuTTY version numbering
  */
 
-#define STR1(x) #x
-#define STR(x) STR1(x)
-
-#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.
+ * The difficult part of deciding what goes in these version strings
+ * is done in Buildscr, and then written into version.h. All we have
+ * to do here is to drop it into variables of the right names.
  */
-# include "empty.h"
-#endif
-
-#if defined SNAPSHOT
-
-#if defined SVN_REV
-#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV)
-#else
-#define SNAPSHOT_TEXT STR(SNAPSHOT)
-#endif
-
-char ver[] = "Development snapshot " SNAPSHOT_TEXT;
-char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT;
-
-#undef SNAPSHOT_TEXT
-
-#elif defined RELEASE
-
-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__;
-char sshver[] = "PuTTY-Custom-r" STR(SVN_REV);
-
-#else
 
-char ver[] = "Unidentified build, " __DATE__ " " __TIME__;
-char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__;
+#include "version.h"
 
-#endif
+char ver[] = TEXTVER;
+char sshver[] = SSHVER;
 
 /*
  * SSH local version string MUST be under 40 characters. Here's a