diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 131 |
1 files changed, 70 insertions, 61 deletions
diff --git a/Makefile.in b/Makefile.in index e1f68a5c..588c3418 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ bin_PROGRAMS = src/pattern_sim$(EXEEXT) src/process_hkl$(EXEEXT) \ src/sum_stack$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) noinst_PROGRAMS = tests/list_check$(EXEEXT) TESTS = tests/list_check$(EXEEXT) -@HAVE_GTK_TRUE@am__append_1 = src/hdfsee +@HAVE_GTK_TRUE@am__append_1 = src/hdfsee src/geomatic @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 = src/diffraction-gpu.c src/cl-utils.c @@ -74,11 +74,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@HAVE_GTK_TRUE@am__EXEEXT_1 = src/hdfsee$(EXEEXT) +@HAVE_GTK_TRUE@am__EXEEXT_1 = src/hdfsee$(EXEEXT) \ +@HAVE_GTK_TRUE@ src/geomatic$(EXEEXT) @HAVE_CAIRO_TRUE@am__EXEEXT_2 = src/cubeit$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(crystfeldir)" \ - "$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(hdfseedir)" \ - "$(DESTDIR)$(scriptdir)" + "$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(scriptdir)" PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__dirstamp = $(am__leading_dot)dirstamp am_src_calibrate_detector_OBJECTS = src/calibrate_detector.$(OBJEXT) \ @@ -123,6 +123,20 @@ src_estimate_background_OBJECTS = \ $(am_src_estimate_background_OBJECTS) src_estimate_background_LDADD = $(LDADD) src_estimate_background_DEPENDENCIES = $(top_builddir)/lib/libgnu.a +am__src_geomatic_SOURCES_DIST = src/geomatic.c src/dw-geomatic.c \ + src/render.c src/hdf5-file.c src/utils.c src/image.c \ + src/filters.c src/thread-pool.c src/cell.c src/reflist.c \ + src/geometry.c src/peaks.c src/detector.c +@HAVE_GTK_TRUE@am_src_geomatic_OBJECTS = src/geomatic.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/dw-geomatic.$(OBJEXT) src/render.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/image.$(OBJEXT) src/filters.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/thread-pool.$(OBJEXT) src/cell.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/reflist.$(OBJEXT) src/geometry.$(OBJEXT) \ +@HAVE_GTK_TRUE@ src/peaks.$(OBJEXT) src/detector.$(OBJEXT) +src_geomatic_OBJECTS = $(am_src_geomatic_OBJECTS) +src_geomatic_LDADD = $(LDADD) +src_geomatic_DEPENDENCIES = $(top_builddir)/lib/libgnu.a am_src_get_hkl_OBJECTS = src/get_hkl.$(OBJEXT) src/sfac.$(OBJEXT) \ src/cell.$(OBJEXT) src/utils.$(OBJEXT) \ src/reflections.$(OBJEXT) src/symmetry.$(OBJEXT) \ @@ -259,16 +273,18 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(src_calibrate_detector_SOURCES) $(src_check_hkl_SOURCES) \ $(src_compare_hkl_SOURCES) $(src_cubeit_SOURCES) \ - $(src_estimate_background_SOURCES) $(src_get_hkl_SOURCES) \ - $(src_hdfsee_SOURCES) $(src_indexamajig_SOURCES) \ - $(src_partialator_SOURCES) $(src_pattern_sim_SOURCES) \ - $(src_powder_plot_SOURCES) $(src_process_hkl_SOURCES) \ - $(src_reintegrate_SOURCES) $(src_render_hkl_SOURCES) \ - $(src_sum_stack_SOURCES) $(tests_list_check_SOURCES) + $(src_estimate_background_SOURCES) $(src_geomatic_SOURCES) \ + $(src_get_hkl_SOURCES) $(src_hdfsee_SOURCES) \ + $(src_indexamajig_SOURCES) $(src_partialator_SOURCES) \ + $(src_pattern_sim_SOURCES) $(src_powder_plot_SOURCES) \ + $(src_process_hkl_SOURCES) $(src_reintegrate_SOURCES) \ + $(src_render_hkl_SOURCES) $(src_sum_stack_SOURCES) \ + $(tests_list_check_SOURCES) DIST_SOURCES = $(src_calibrate_detector_SOURCES) \ $(src_check_hkl_SOURCES) $(src_compare_hkl_SOURCES) \ $(am__src_cubeit_SOURCES_DIST) \ - $(src_estimate_background_SOURCES) $(src_get_hkl_SOURCES) \ + $(src_estimate_background_SOURCES) \ + $(am__src_geomatic_SOURCES_DIST) $(src_get_hkl_SOURCES) \ $(am__src_hdfsee_SOURCES_DIST) \ $(am__src_indexamajig_SOURCES_DIST) $(src_partialator_SOURCES) \ $(am__src_pattern_sim_SOURCES_DIST) $(src_powder_plot_SOURCES) \ @@ -303,8 +319,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -DATA = $(crystfel_DATA) $(crystfeldoc_DATA) $(hdfsee_DATA) \ - $(script_DATA) +DATA = $(crystfel_DATA) $(crystfeldoc_DATA) $(script_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -559,13 +574,14 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 src/cell.h src/hdf5-file.h \ src/povray.h src/index-priv.h src/geometry.h src/templates.h \ src/render_hkl.h src/stream.h src/thread-pool.h \ src/beam-parameters.h src/post-refinement.h src/hrs-scaling.h \ - data/sfac/Ca.nff data/sfac/C.nff data/sfac/Fe.nff \ - data/sfac/H.nff data/sfac/Mg.nff data/sfac/N.nff \ - data/sfac/O.nff data/sfac/P.nff data/sfac/S.nff \ - data/sfac/f0_WaasKirf.dat data/defs.h data/diffraction.cl \ - data/displaywindow.ui doc/geometry.txt doc/indexamajig.txt \ - doc/pattern_sim.txt doc/process_hkl.txt doc/symmetry.txt \ - doc/twin-calculator.pdf doc/0-INDEX doc/examples/lcls-dec.geom \ + src/dw-geomatic.h data/sfac/Ca.nff data/sfac/C.nff \ + data/sfac/Fe.nff data/sfac/H.nff data/sfac/Mg.nff \ + data/sfac/N.nff data/sfac/O.nff data/sfac/P.nff \ + data/sfac/S.nff data/sfac/f0_WaasKirf.dat data/defs.h \ + data/diffraction.cl data/hdfsee.ui data/geomatic.ui \ + doc/geometry.txt doc/indexamajig.txt doc/pattern_sim.txt \ + doc/process_hkl.txt doc/symmetry.txt doc/twin-calculator.pdf \ + doc/0-INDEX doc/examples/lcls-dec.geom \ doc/examples/lcls-june-r0013-r0128.geom \ doc/examples/lcls-xpp-estimate.geom doc/examples/simple.geom \ scripts/check-near-bragg scripts/double-hit \ @@ -602,6 +618,11 @@ src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \ @HAVE_GTK_TRUE@ src/hdf5-file.c src/utils.c src/image.c src/filters.c \ @HAVE_GTK_TRUE@ src/thread-pool.c +@HAVE_GTK_TRUE@src_geomatic_SOURCES = src/geomatic.c src/dw-geomatic.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/cell.c src/reflist.c src/geometry.c \ +@HAVE_GTK_TRUE@ src/peaks.c src/detector.c + src_get_hkl_SOURCES = src/get_hkl.c src/sfac.c src/cell.c src/utils.c \ src/reflections.c src/symmetry.c src/beam-parameters.c \ src/thread-pool.c @@ -654,13 +675,12 @@ tests_list_check_SOURCES = tests/list_check.c src/reflist.c src/thread-pool.c \ src/utils.c INCLUDES = "-I$(top_srcdir)/data" -hdfseedir = $(datadir)/hdfsee -hdfsee_DATA = data/displaywindow.ui crystfeldir = $(datadir)/crystfel crystfel_DATA = data/diffraction.cl data/defs.h data/sfac/Ca.nff \ data/sfac/C.nff data/sfac/Fe.nff data/sfac/H.nff \ data/sfac/Mg.nff data/sfac/N.nff data/sfac/O.nff \ - data/sfac/P.nff data/sfac/S.nff data/sfac/f0_WaasKirf.dat + data/sfac/P.nff data/sfac/S.nff data/sfac/f0_WaasKirf.dat \ + data/hdfsee.ui data/geomatic.ui crystfeldocdir = $(docdir) crystfeldoc_DATA = doc/geometry.txt doc/indexamajig.txt doc/pattern_sim.txt \ @@ -834,6 +854,18 @@ src/estimate_background.$(OBJEXT): src/$(am__dirstamp) \ src/estimate_background$(EXEEXT): $(src_estimate_background_OBJECTS) $(src_estimate_background_DEPENDENCIES) src/$(am__dirstamp) @rm -f src/estimate_background$(EXEEXT) $(AM_V_CCLD)$(LINK) $(src_estimate_background_OBJECTS) $(src_estimate_background_LDADD) $(LIBS) +src/geomatic.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/dw-geomatic.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/reflist.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/geometry.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/peaks.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +src/geomatic$(EXEEXT): $(src_geomatic_OBJECTS) $(src_geomatic_DEPENDENCIES) src/$(am__dirstamp) + @rm -f src/geomatic$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(src_geomatic_OBJECTS) $(src_geomatic_LDADD) $(LIBS) src/get_hkl.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/beam-parameters.$(OBJEXT): src/$(am__dirstamp) \ @@ -850,7 +882,6 @@ src/hdfsee$(EXEEXT): $(src_hdfsee_OBJECTS) $(src_hdfsee_DEPENDENCIES) src/$(am__ $(AM_V_CCLD)$(LINK) $(src_hdfsee_OBJECTS) $(src_hdfsee_LDADD) $(LIBS) src/indexamajig.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/peaks.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/index.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/diffraction.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -859,10 +890,6 @@ src/mosflm.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/templates.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/geometry.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) -src/reflist.$(OBJEXT): src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/diffraction-gpu.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/cl-utils.$(OBJEXT): src/$(am__dirstamp) \ @@ -937,8 +964,10 @@ mostlyclean-compile: -rm -f src/diffraction.$(OBJEXT) -rm -f src/dirax.$(OBJEXT) -rm -f src/displaywindow.$(OBJEXT) + -rm -f src/dw-geomatic.$(OBJEXT) -rm -f src/estimate_background.$(OBJEXT) -rm -f src/filters.$(OBJEXT) + -rm -f src/geomatic.$(OBJEXT) -rm -f src/geometry.$(OBJEXT) -rm -f src/get_hkl.$(OBJEXT) -rm -f src/hdf5-file.$(OBJEXT) @@ -985,8 +1014,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diffraction.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dirax.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/displaywindow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dw-geomatic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/estimate_background.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/filters.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/geomatic.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/geometry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/get_hkl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/hdf5-file.Po@am__quote@ @@ -1075,26 +1106,6 @@ uninstall-crystfeldocDATA: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(crystfeldocdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(crystfeldocdir)" && rm -f $$files -install-hdfseeDATA: $(hdfsee_DATA) - @$(NORMAL_INSTALL) - test -z "$(hdfseedir)" || $(MKDIR_P) "$(DESTDIR)$(hdfseedir)" - @list='$(hdfsee_DATA)'; test -n "$(hdfseedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hdfseedir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(hdfseedir)" || exit $$?; \ - done - -uninstall-hdfseeDATA: - @$(NORMAL_UNINSTALL) - @list='$(hdfsee_DATA)'; test -n "$(hdfseedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(hdfseedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(hdfseedir)" && rm -f $$files install-scriptDATA: $(script_DATA) @$(NORMAL_INSTALL) test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)" @@ -1524,7 +1535,7 @@ check: check-recursive all-am: Makefile $(PROGRAMS) $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(crystfeldir)" "$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(hdfseedir)" "$(DESTDIR)$(scriptdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(crystfeldir)" "$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(scriptdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1581,7 +1592,7 @@ info: info-recursive info-am: install-data-am: install-crystfelDATA install-crystfeldocDATA \ - install-hdfseeDATA install-scriptDATA + install-scriptDATA install-dvi: install-dvi-recursive @@ -1629,8 +1640,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-crystfelDATA \ - uninstall-crystfeldocDATA uninstall-hdfseeDATA \ - uninstall-scriptDATA + uninstall-crystfeldocDATA uninstall-scriptDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ ctags-recursive install-am install-strip tags-recursive @@ -1646,15 +1656,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-crystfelDATA \ install-binPROGRAMS install-crystfelDATA \ install-crystfeldocDATA install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ - install-hdfseeDATA install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-scriptDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-crystfelDATA \ - uninstall-crystfeldocDATA uninstall-hdfseeDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-scriptDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-crystfelDATA uninstall-crystfeldocDATA \ uninstall-scriptDATA |