diff options
| author | Thomas White <taw@physics.org> | 2020-07-29 15:44:02 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:45 +0200 |
| commit | 42898f7d59e215434fa2aead84223f64b30fcee8 (patch) | |
| tree | 5cdfb4c0c279c766efcbbc6c455ee58a5c8741f1 /src/whirligig.c | |
| parent | 6105a7797b96418d940ced7d88c6cf2b308b9711 (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/whirligig.c')
| -rw-r--r-- | src/whirligig.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/whirligig.c b/src/whirligig.c index 6c007f0b..16688559 100644 --- a/src/whirligig.c +++ b/src/whirligig.c @@ -42,11 +42,13 @@ #include <image.h> #include <utils.h> #include <stream.h> +#include <cell-utils.h> +#include <integer_matrix.h> +#include <reflist.h> +#include <reflist-utils.h> + +#include "version.h" -#include "cell-utils.h" -#include "integer_matrix.h" -#include "reflist.h" -#include "reflist-utils.h" /* Maximum number of series which can overlap at once */ #define MAX_SER 8 @@ -634,8 +636,10 @@ int main(int argc, char *argv[]) break; case 3 : - 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 4 : |