diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 77193584..a1d869fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,22 +38,23 @@ host_triplet = @host@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \ src/get_hkl$(EXEEXT) src/indexamajig$(EXEEXT) \ src/compare_hkl$(EXEEXT) src/powder_plot$(EXEEXT) \ - src/render_hkl$(EXEEXT) src/calibrate_detector$(EXEEXT) \ - src/partialator$(EXEEXT) src/check_hkl$(EXEEXT) \ - src/partial_sim$(EXEEXT) $(am__EXEEXT_1) + src/calibrate_detector$(EXEEXT) src/partialator$(EXEEXT) \ + src/check_hkl$(EXEEXT) src/partial_sim$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) noinst_PROGRAMS = tests/list_check$(EXEEXT) \ tests/integration_check$(EXEEXT) \ tests/pr_gradient_check$(EXEEXT) tests/symmetry_check$(EXEEXT) \ - $(am__EXEEXT_2) + $(am__EXEEXT_3) TESTS = tests/list_check$(EXEEXT) tests/first_merge_check \ tests/second_merge_check tests/third_merge_check \ tests/fourth_merge_check tests/integration_check$(EXEEXT) \ tests/pr_gradient_check$(EXEEXT) tests/symmetry_check$(EXEEXT) \ - $(am__EXEEXT_2) + $(am__EXEEXT_3) @BUILD_HDFSEE_TRUE@am__append_1 = src/hdfsee -@HAVE_OPENCL_TRUE@am__append_2 = tests/gpu_sim_check +@HAVE_CAIRO_TRUE@am__append_2 = src/render_hkl @HAVE_OPENCL_TRUE@am__append_3 = tests/gpu_sim_check -@HAVE_CAIRO_TRUE@am__append_4 = src/scaling-report.c +@HAVE_OPENCL_TRUE@am__append_4 = tests/gpu_sim_check +@HAVE_CAIRO_TRUE@am__append_5 = src/scaling-report.c subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -84,10 +85,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @BUILD_HDFSEE_TRUE@am__EXEEXT_1 = src/hdfsee$(EXEEXT) +@HAVE_CAIRO_TRUE@am__EXEEXT_2 = src/render_hkl$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(crystfeldir)" "$(DESTDIR)$(crystfeldocdir)" \ "$(DESTDIR)$(scriptdir)" -@HAVE_OPENCL_TRUE@am__EXEEXT_2 = tests/gpu_sim_check$(EXEEXT) +@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) @@ -155,8 +157,8 @@ src_process_hkl_OBJECTS = $(am_src_process_hkl_OBJECTS) src_process_hkl_LDADD = $(LDADD) src_process_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a \ $(top_builddir)/libcrystfel/libcrystfel.la -am_src_render_hkl_OBJECTS = src/render_hkl.$(OBJEXT) \ - src/povray.$(OBJEXT) +am__src_render_hkl_SOURCES_DIST = src/render_hkl.c +@HAVE_CAIRO_TRUE@am_src_render_hkl_OBJECTS = src/render_hkl.$(OBJEXT) src_render_hkl_OBJECTS = $(am_src_render_hkl_OBJECTS) src_render_hkl_LDADD = $(LDADD) src_render_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a \ @@ -235,7 +237,7 @@ DIST_SOURCES = $(src_calibrate_detector_SOURCES) \ $(src_indexamajig_SOURCES) $(src_partial_sim_SOURCES) \ $(am__src_partialator_SOURCES_DIST) $(src_pattern_sim_SOURCES) \ $(src_powder_plot_SOURCES) $(src_process_hkl_SOURCES) \ - $(src_render_hkl_SOURCES) \ + $(am__src_render_hkl_SOURCES_DIST) \ $(am__tests_gpu_sim_check_SOURCES_DIST) \ $(tests_integration_check_SOURCES) $(tests_list_check_SOURCES) \ $(tests_pr_gradient_check_SOURCES) \ @@ -541,7 +543,7 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 tests/first_merge_check \ tests/second_merge_check tests/third_merge_check \ tests/fourth_merge_check tests/first_merge_check.hkl \ tests/third_merge_check.hkl tests/fourth_merge_check.hkl \ - src/dw-hdfsee.h src/hdfsee.h src/povray.h src/render_hkl.h \ + src/dw-hdfsee.h src/hdfsee.h src/render_hkl.h \ src/post-refinement.h src/hrs-scaling.h src/scaling-report.h \ $(crystfel_DATA) doc/twin-calculator.pdf \ doc/examples/lcls-dec.geom \ @@ -574,10 +576,10 @@ src_get_hkl_SOURCES = src/get_hkl.c src_compare_hkl_SOURCES = src/compare_hkl.c src_check_hkl_SOURCES = src/check_hkl.c src_powder_plot_SOURCES = src/powder_plot.c -src_render_hkl_SOURCES = src/render_hkl.c src/povray.c +@HAVE_CAIRO_TRUE@src_render_hkl_SOURCES = src/render_hkl.c src_calibrate_detector_SOURCES = src/calibrate_detector.c src_partialator_SOURCES = src/partialator.c src/post-refinement.c \ - src/hrs-scaling.c $(am__append_4) + src/hrs-scaling.c $(am__append_5) tests_list_check_SOURCES = tests/list_check.c tests_integration_check_SOURCES = tests/integration_check.c tests_symmetry_check_SOURCES = tests/symmetry_check.c @@ -790,8 +792,6 @@ src/process_hkl$(EXEEXT): $(src_process_hkl_OBJECTS) $(src_process_hkl_DEPENDENC $(AM_V_CCLD)$(LINK) $(src_process_hkl_OBJECTS) $(src_process_hkl_LDADD) $(LIBS) src/render_hkl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/povray.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/render_hkl$(EXEEXT): $(src_render_hkl_OBJECTS) $(src_render_hkl_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/render_hkl$(EXEEXT) $(AM_V_CCLD)$(LINK) $(src_render_hkl_OBJECTS) $(src_render_hkl_LDADD) $(LIBS) @@ -841,7 +841,6 @@ mostlyclean-compile: -rm -f src/partialator.$(OBJEXT) -rm -f src/pattern_sim.$(OBJEXT) -rm -f src/post-refinement.$(OBJEXT) - -rm -f src/povray.$(OBJEXT) -rm -f src/powder_plot.$(OBJEXT) -rm -f src/process_hkl.$(OBJEXT) -rm -f src/render_hkl.$(OBJEXT) @@ -867,7 +866,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/partialator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pattern_sim.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/post-refinement.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/povray.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/powder_plot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/process_hkl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/render_hkl.Po@am__quote@ |