From 4a56d62ddc2a710b3dfecfdfa134755fd3d6c521 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 20 Jan 2012 12:50:09 -0800 Subject: Don't compile or use ReAx if FFTW is not available --- libcrystfel/Makefile.am | 7 +++++-- libcrystfel/Makefile.in | 26 ++++++++++++++++---------- libcrystfel/src/reax.h | 21 ++++++++++++++++++++- 3 files changed, 41 insertions(+), 13 deletions(-) (limited to 'libcrystfel') diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am index 1dc9258f..cebb20e9 100644 --- a/libcrystfel/Makefile.am +++ b/libcrystfel/Makefile.am @@ -6,8 +6,11 @@ libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \ src/beam-parameters.c src/geometry.c src/statistics.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/reax.c + src/render.c src/index.c src/dirax.c src/mosflm.c + +if HAVE_FFTW +libcrystfel_la_SOURCES += src/reax.c +endif libcrystfel_la_includedir=$(includedir)/crystfel/ diff --git a/libcrystfel/Makefile.in b/libcrystfel/Makefile.in index f07bd5dd..b22a3b8b 100644 --- a/libcrystfel/Makefile.in +++ b/libcrystfel/Makefile.in @@ -35,6 +35,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_FFTW_TRUE@am__append_1 = src/reax.c subdir = libcrystfel DIST_COMMON = $(libcrystfel_la_include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -83,13 +84,20 @@ am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libcrystfel_la_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libcrystfel_la_DEPENDENCIES = +am__libcrystfel_la_SOURCES_DIST = src/reflist.c src/utils.c src/cell.c \ + src/detector.c src/thread-pool.c src/image.c src/hdf5-file.c \ + src/beam-parameters.c src/geometry.c src/statistics.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/reax.c am__dirstamp = $(am__leading_dot)dirstamp +@HAVE_FFTW_TRUE@am__objects_1 = src/reax.lo am_libcrystfel_la_OBJECTS = src/reflist.lo src/utils.lo src/cell.lo \ src/detector.lo src/thread-pool.lo src/image.lo \ src/hdf5-file.lo src/beam-parameters.lo src/geometry.lo \ src/statistics.lo src/symmetry.lo src/stream.lo src/peaks.lo \ src/reflist-utils.lo src/filters.lo src/render.lo src/index.lo \ - src/dirax.lo src/mosflm.lo src/reax.lo + src/dirax.lo src/mosflm.lo $(am__objects_1) libcrystfel_la_OBJECTS = $(am_libcrystfel_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -121,7 +129,7 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libcrystfel_la_SOURCES) -DIST_SOURCES = $(libcrystfel_la_SOURCES) +DIST_SOURCES = $(am__libcrystfel_la_SOURCES_DIST) HEADERS = $(libcrystfel_la_include_HEADERS) ETAGS = etags CTAGS = ctags @@ -355,14 +363,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libcrystfel.la libcrystfel_la_LIBADD = @LIBCRYSTFEL_LIBS@ -libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \ - src/thread-pool.c src/image.c src/hdf5-file.c \ - src/beam-parameters.c src/geometry.c src/statistics.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/reax.c - +libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c \ + src/detector.c src/thread-pool.c src/image.c src/hdf5-file.c \ + src/beam-parameters.c src/geometry.c src/statistics.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 $(am__append_1) libcrystfel_la_includedir = $(includedir)/crystfel/ libcrystfel_la_include_HEADERS = src/beam-parameters.h src/hdf5-file.h \ src/reflist.h src/symmetry.h src/cell.h \ diff --git a/libcrystfel/src/reax.h b/libcrystfel/src/reax.h index 543cd0d5..60decac9 100644 --- a/libcrystfel/src/reax.h +++ b/libcrystfel/src/reax.h @@ -19,9 +19,28 @@ #include "cell.h" +#ifdef HAVE_FFTW + extern IndexingPrivate *reax_prepare(void); extern void reax_cleanup(IndexingPrivate *pp); - extern void reax_index(IndexingPrivate *p, struct image *image, UnitCell *cell); +#else /* HAVE_FFTW */ + +static IndexingPrivate *reax_prepare() +{ + return NULL; +} + +static void reax_cleanup(IndexingPrivate *pp) +{ +} + +static void reax_index(IndexingPrivate *p, struct image *image, UnitCell *cell) +{ +} + + +#endif /* HAVE_FFTW */ + #endif /* REAX_H */ -- cgit v1.2.3