aboutsummaryrefslogtreecommitdiff
path: root/src/process_hkl.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-07-29 15:44:02 +0200
committerThomas White <taw@physics.org>2020-07-29 18:53:45 +0200
commit42898f7d59e215434fa2aead84223f64b30fcee8 (patch)
tree5cdfb4c0c279c766efcbbc6c455ee58a5c8741f1 /src/process_hkl.c
parent6105a7797b96418d940ced7d88c6cf2b308b9711 (diff)
New way of injecting version information
Also, this fixes some incorrect headers and adds --version flags to programs which didn't yet have them.
Diffstat (limited to 'src/process_hkl.c')
-rw-r--r--src/process_hkl.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/process_hkl.c b/src/process_hkl.c
index b840f4ce..352bea4a 100644
--- a/src/process_hkl.c
+++ b/src/process_hkl.c
@@ -43,16 +43,18 @@
#include <unistd.h>
#include <getopt.h>
-#include "utils.h"
-#include "reflist-utils.h"
-#include "symmetry.h"
-#include "stream.h"
-#include "reflist.h"
-#include "image.h"
-#include "crystal.h"
-#include "thread-pool.h"
-#include "geometry.h"
-#include "cell-utils.h"
+#include <utils.h>
+#include <reflist-utils.h>
+#include <symmetry.h>
+#include <stream.h>
+#include <reflist.h>
+#include <image.h>
+#include <crystal.h>
+#include <thread-pool.h>
+#include <geometry.h>
+#include <cell-utils.h>
+
+#include "version.h"
static void show_help(const char *s)
@@ -664,8 +666,10 @@ int main(int argc, char *argv[])
break;
case 7 :
- 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 '?' :