From 42898f7d59e215434fa2aead84223f64b30fcee8 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 29 Jul 2020 15:44:02 +0200
Subject: New way of injecting version information

Also, this fixes some incorrect headers and adds --version flags to
programs which didn't yet have them.
---
 src/render_hkl.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/render_hkl.c')

diff --git a/src/render_hkl.c b/src/render_hkl.c
index f2ffa211..3f539cb2 100644
--- a/src/render_hkl.c
+++ b/src/render_hkl.c
@@ -45,13 +45,15 @@
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_blas.h>
 
-#include "utils.h"
-#include "symmetry.h"
-#include "colscale.h"
+#include <utils.h>
+#include <symmetry.h>
+#include <colscale.h>
+#include <reflist.h>
+#include <reflist-utils.h>
+#include <cell-utils.h>
+
 #include "render_hkl.h"
-#include "reflist.h"
-#include "reflist-utils.h"
-#include "cell-utils.h"
+#include "version.h"
 
 
 #define KEY_FILENAME "key.pdf"
@@ -811,8 +813,10 @@ int main(int argc, char *argv[])
 			return 0;
 
 			case 5 :
-			printf("CrystFEL: " CRYSTFEL_VERSIONSTRING "\n");
-			printf(CRYSTFEL_BOILERPLATE"\n");
+			printf("CrystFEL: %s\n",
+			       crystfel_version_string());
+			printf("%s\n",
+			       crystfel_licence_string());
 			return 0;
 
 			case 'p' :
-- 
cgit v1.2.3