diff options
author | Thomas White <taw@physics.org> | 2015-06-18 14:27:41 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2015-06-18 14:27:41 +0200 |
commit | 8b21e8706963a8f327759b24377e7dff2fff60db (patch) | |
tree | 397aefc7cb57005fc99d61da609834f331746265 /libcrystfel/Makefile.am | |
parent | edf2ad46f4c0f403b90d3058018a295baa9d0753 (diff) | |
parent | 091e3378a95edab85a6c655629df4270fb041b04 (diff) |
Merge branch 'tolstikova/dirax'
Conflicts:
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 9fbd4483..989ce434 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -10,7 +10,7 @@ libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.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/xds.c src/integration.c \ - src/histogram.c src/events.c + src/histogram.c src/events.c src/asdf.c if HAVE_FFTW libcrystfel_la_SOURCES += src/reax.c @@ -30,7 +30,7 @@ libcrystfel_la_include_HEADERS = ${top_srcdir}/version.h \ src/integer_matrix.h src/crystal.h \ src/grainspotter.h src/xds.h \ src/integration.h src/histogram.h \ - src/events.h + src/events.h src/asdf.h AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -Wall AM_CPPFLAGS += -I$(top_srcdir)/lib @LIBCRYSTFEL_CFLAGS@ |