diff options
| author | Thomas White <taw@physics.org> | 2021-03-12 10:16:37 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-03-12 11:24:42 +0100 |
| commit | 87d60b8110e68ab42052588f275506eaca4f521f (patch) | |
| tree | 8e5c929e865dd905148f7554250c29663e6480bd | |
| parent | 52290007860c1fa0908e57f5cb84426f978e5398 (diff) | |
FromFile indexer: Move to libcrystfel/src/indexers
Also adds to meson.build
| -rw-r--r-- | libcrystfel/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libcrystfel/meson.build | 1 | ||||
| -rw-r--r-- | libcrystfel/src/index.c | 2 | ||||
| -rw-r--r-- | libcrystfel/src/indexers/fromfile.c (renamed from libcrystfel/src/fromfile.c) | 0 | ||||
| -rw-r--r-- | libcrystfel/src/indexers/fromfile.h (renamed from libcrystfel/src/fromfile.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/libcrystfel/CMakeLists.txt b/libcrystfel/CMakeLists.txt index f92e8be2..fc5574fd 100644 --- a/libcrystfel/CMakeLists.txt +++ b/libcrystfel/CMakeLists.txt @@ -59,7 +59,6 @@ set(LIBCRYSTFEL_SOURCES src/image-cbf.c src/image-hdf5.c src/fom.c - src/fromfile.c ${BISON_symopp_OUTPUTS} ${FLEX_symopl_OUTPUTS} src/indexers/dirax.c @@ -70,6 +69,7 @@ set(LIBCRYSTFEL_SOURCES src/indexers/asdf.c src/indexers/xgandalf.c src/indexers/pinkindexer.c + src/indexers/fromfile.c ) set(LIBCRYSTFEL_HEADERS @@ -99,7 +99,6 @@ set(LIBCRYSTFEL_HEADERS src/detgeom.h src/image-msgpack.h src/fom.h - src/fromfile.h ) if (MSGPACK_FOUND) diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 8b8eb77d..7171f321 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -104,6 +104,7 @@ libcrystfel_sources = ['src/image.c', 'src/indexers/asdf.c', 'src/indexers/xgandalf.c', 'src/indexers/pinkindexer.c', + 'src/indexers/fromfile.c', symop_lex_ch, symop_parse_ch, ] diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 58e90437..c2f79eff 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -59,7 +59,7 @@ #include "indexers/taketwo.h" #include "indexers/xgandalf.h" #include "indexers/pinkindexer.h" -#include "fromfile.h" +#include "indexers/fromfile.h" #include "uthash.h" diff --git a/libcrystfel/src/fromfile.c b/libcrystfel/src/indexers/fromfile.c index 13044ebe..13044ebe 100644 --- a/libcrystfel/src/fromfile.c +++ b/libcrystfel/src/indexers/fromfile.c diff --git a/libcrystfel/src/fromfile.h b/libcrystfel/src/indexers/fromfile.h index 29d31aee..29d31aee 100644 --- a/libcrystfel/src/fromfile.h +++ b/libcrystfel/src/indexers/fromfile.h |