diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 14:51:36 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 14:51:36 +0100 |
| commit | 31ec28ea0258bbb2272afa4346b55b183a43410c (patch) | |
| tree | e5c3df47166401b9a80384a2f5f137d674f5bef9 /libcrystfel/Makefile.am | |
| parent | a0f4c1506f1d7c1ad942bcccd30d3aaf0cd75bd4 (diff) | |
| parent | 3732cd6e08e4b0e6b6eaafc01290bc2c23e9ec66 (diff) | |
Merge branch 'cornelius/xds' 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index ae315594..5f5ff7fa 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -9,7 +9,7 @@ libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.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/grainspotter.c + src/grainspotter.c src/xds.c if HAVE_FFTW libcrystfel_la_SOURCES += src/reax.c @@ -26,7 +26,7 @@ libcrystfel_la_include_HEADERS = src/beam-parameters.h src/hdf5-file.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/grainspotter.h + src/grainspotter.h src/xds.h AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -Wall AM_CPPFLAGS += -I$(top_srcdir)/lib @LIBCRYSTFEL_CFLAGS@ |