diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | Makefile.in | 45 |
2 files changed, 36 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index aceeba44..a5de7acc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \ src/calibrate_detector src/partialator src/reintegrate \ src/estimate_background src/check_hkl src/sum_stack -noinst_PROGRAMS = tests/list_check tests/gpu_sim_check +noinst_PROGRAMS = tests/list_check TESTS = tests/list_check @@ -30,7 +30,15 @@ src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c src/utils.c \ src/symmetry.c src/thread-pool.c src/reflist.c if HAVE_OPENCL src_pattern_sim_SOURCES += src/diffraction-gpu.c src/cl-utils.c + TESTS += tests/gpu_sim_check +noinst_PROGRAMS += tests/gpu_sim_check + +tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/utils.c \ + src/diffraction.c src/diffraction-gpu.c \ + src/thread-pool.c src/cell.c src/cl-utils.c \ + src/symmetry.c src/detector.c src/hdf5-file.c \ + src/image.c endif src_process_hkl_SOURCES = src/process_hkl.c src/sfac.c src/statistics.c \ @@ -110,12 +118,6 @@ src_estimate_background_SOURCES = src/estimate_background.c src/stream.c \ tests_list_check_SOURCES = tests/list_check.c src/reflist.c src/thread-pool.c \ src/utils.c -tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/utils.c \ - src/diffraction.c src/diffraction-gpu.c \ - src/thread-pool.c src/cell.c src/cl-utils.c \ - src/symmetry.c src/detector.c src/hdf5-file.c \ - src/image.c - INCLUDES = "-I$(top_srcdir)/data" EXTRA_DIST += src/cell.h src/hdf5-file.h src/image.h src/utils.h \ diff --git a/Makefile.in b/Makefile.in index 339de1fd..1a98404e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,14 +42,14 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \ src/partialator$(EXEEXT) src/reintegrate$(EXEEXT) \ src/estimate_background$(EXEEXT) src/check_hkl$(EXEEXT) \ src/sum_stack$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) -noinst_PROGRAMS = tests/list_check$(EXEEXT) \ - tests/gpu_sim_check$(EXEEXT) +noinst_PROGRAMS = tests/list_check$(EXEEXT) $(am__EXEEXT_3) TESTS = tests/list_check$(EXEEXT) $(am__EXEEXT_3) @HAVE_GTK_TRUE@am__append_1 = src/hdfsee @HAVE_CAIRO_TRUE@am__append_2 = src/cubeit @HAVE_OPENCL_TRUE@am__append_3 = src/diffraction-gpu.c src/cl-utils.c @HAVE_OPENCL_TRUE@am__append_4 = tests/gpu_sim_check -@HAVE_OPENCL_TRUE@am__append_5 = src/diffraction-gpu.c src/cl-utils.c +@HAVE_OPENCL_TRUE@am__append_5 = tests/gpu_sim_check +@HAVE_OPENCL_TRUE@am__append_6 = src/diffraction-gpu.c src/cl-utils.c subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -80,6 +80,7 @@ CONFIG_CLEAN_VPATH_FILES = @HAVE_CAIRO_TRUE@am__EXEEXT_2 = src/cubeit$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(crystfeldir)" \ "$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(scriptdir)" +@HAVE_OPENCL_TRUE@am__EXEEXT_3 = tests/gpu_sim_check$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp am_src_calibrate_detector_OBJECTS = src/calibrate_detector.$(OBJEXT) \ @@ -231,12 +232,20 @@ am_src_sum_stack_OBJECTS = src/sum_stack.$(OBJEXT) src/utils.$(OBJEXT) \ src_sum_stack_OBJECTS = $(am_src_sum_stack_OBJECTS) src_sum_stack_LDADD = $(LDADD) src_sum_stack_DEPENDENCIES = $(top_builddir)/lib/libgnu.a -am_tests_gpu_sim_check_OBJECTS = tests/gpu_sim_check.$(OBJEXT) \ - src/utils.$(OBJEXT) src/diffraction.$(OBJEXT) \ - src/diffraction-gpu.$(OBJEXT) src/thread-pool.$(OBJEXT) \ - src/cell.$(OBJEXT) src/cl-utils.$(OBJEXT) \ - src/symmetry.$(OBJEXT) src/detector.$(OBJEXT) \ - src/hdf5-file.$(OBJEXT) src/image.$(OBJEXT) +am__tests_gpu_sim_check_SOURCES_DIST = tests/gpu_sim_check.c \ + src/utils.c src/diffraction.c src/diffraction-gpu.c \ + src/thread-pool.c src/cell.c src/cl-utils.c src/symmetry.c \ + src/detector.c src/hdf5-file.c src/image.c +@HAVE_OPENCL_TRUE@am_tests_gpu_sim_check_OBJECTS = \ +@HAVE_OPENCL_TRUE@ tests/gpu_sim_check.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/utils.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/diffraction.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/diffraction-gpu.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/thread-pool.$(OBJEXT) src/cell.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/cl-utils.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/symmetry.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/detector.$(OBJEXT) \ +@HAVE_OPENCL_TRUE@ src/hdf5-file.$(OBJEXT) src/image.$(OBJEXT) tests_gpu_sim_check_OBJECTS = $(am_tests_gpu_sim_check_OBJECTS) tests_gpu_sim_check_LDADD = $(LDADD) tests_gpu_sim_check_DEPENDENCIES = $(top_builddir)/lib/libgnu.a @@ -284,7 +293,8 @@ DIST_SOURCES = $(src_calibrate_detector_SOURCES) \ $(am__src_pattern_sim_SOURCES_DIST) $(src_powder_plot_SOURCES) \ $(src_process_hkl_SOURCES) $(src_reintegrate_SOURCES) \ $(src_render_hkl_SOURCES) $(src_sum_stack_SOURCES) \ - $(tests_gpu_sim_check_SOURCES) $(tests_list_check_SOURCES) + $(am__tests_gpu_sim_check_SOURCES_DIST) \ + $(tests_list_check_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -323,7 +333,6 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -@HAVE_OPENCL_TRUE@am__EXEEXT_3 = tests/gpu_sim_check$(EXEEXT) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -599,6 +608,12 @@ src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \ src/detector.c src/sfac.c src/peaks.c src/reflections.c \ src/beam-parameters.c src/symmetry.c src/thread-pool.c \ src/reflist.c $(am__append_3) +@HAVE_OPENCL_TRUE@tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/utils.c \ +@HAVE_OPENCL_TRUE@ src/diffraction.c src/diffraction-gpu.c \ +@HAVE_OPENCL_TRUE@ src/thread-pool.c src/cell.c src/cl-utils.c \ +@HAVE_OPENCL_TRUE@ src/symmetry.c src/detector.c src/hdf5-file.c \ +@HAVE_OPENCL_TRUE@ src/image.c + src_process_hkl_SOURCES = src/process_hkl.c src/sfac.c src/statistics.c \ src/cell.c src/utils.c src/reflections.c \ src/symmetry.c src/stream.c src/beam-parameters.c \ @@ -609,7 +624,7 @@ src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \ src/filters.c src/diffraction.c src/detector.c src/sfac.c \ src/dirax.c src/mosflm.c src/reflections.c src/symmetry.c \ src/geometry.c src/thread-pool.c src/beam-parameters.c \ - src/reflist.c $(am__append_5) + src/reflist.c $(am__append_6) @HAVE_GTK_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/render.c \ @HAVE_GTK_TRUE@ src/hdf5-file.c src/utils.c src/image.c src/filters.c \ @HAVE_GTK_TRUE@ src/thread-pool.c src/detector.c @@ -666,12 +681,6 @@ src_estimate_background_SOURCES = src/estimate_background.c src/stream.c \ tests_list_check_SOURCES = tests/list_check.c src/reflist.c src/thread-pool.c \ src/utils.c -tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/utils.c \ - src/diffraction.c src/diffraction-gpu.c \ - src/thread-pool.c src/cell.c src/cl-utils.c \ - src/symmetry.c src/detector.c src/hdf5-file.c \ - src/image.c - INCLUDES = "-I$(top_srcdir)/data" crystfeldir = $(datadir)/crystfel crystfel_DATA = data/diffraction.cl data/defs.h data/sfac/Ca.nff \ |