diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
| commit | 2a33b77d38b6d322e456fa1e2cefcbe50620dc39 (patch) | |
| tree | 96c64406f834be9e8423c1565b5dd88a47e682f1 /libcrystfel/Makefile.am | |
| parent | bca26df2b4ad88b56752d62a19b289946f262f94 (diff) | |
| parent | 76d3f48ddf33cc82dc2aaa52c43463dd8bb9cc70 (diff) | |
Merge branch 'tom/grainspotter' into tom/multicrystal
Conflicts:
libcrystfel/Makefile.am
libcrystfel/src/index.c
libcrystfel/src/index.h
Diffstat (limited to 'libcrystfel/Makefile.am')
| -rw-r--r-- | libcrystfel/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index da7e8f64..ae315594 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -8,7 +8,8 @@ libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \ src/symmetry.c src/stream.c src/peaks.c \ src/reflist-utils.c src/filters.c \ src/render.c src/index.c src/dirax.c src/mosflm.c \ - src/cell-utils.c src/integer_matrix.c src/crystal.c + src/cell-utils.c src/integer_matrix.c src/crystal.c \ + src/grainspotter.c if HAVE_FFTW libcrystfel_la_SOURCES += src/reax.c @@ -24,7 +25,8 @@ libcrystfel_la_include_HEADERS = src/beam-parameters.h src/hdf5-file.h \ src/render.h src/index.h src/image.h \ src/filters.h src/dirax.h src/mosflm.h \ src/index-priv.h src/reax.h src/cell-utils.h \ - src/integer_matrix.h src/crystal.h + src/integer_matrix.h src/crystal.h \ + src/grainspotter.h AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -Wall AM_CPPFLAGS += -I$(top_srcdir)/lib @LIBCRYSTFEL_CFLAGS@ |