Move cl-utils back out of libcrystfel

6 files changed, 19 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index f0e5053d..3de1cdda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ LDADD += $(top_builddir)/libcrystfel/libcrystfel.la
 
 src_partial_sim_SOURCES = src/partial_sim.c
 
-src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
+src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c src/cl-utils.c \
                           src/diffraction-gpu.c
 if HAVE_OPENCL
 TESTS += tests/gpu_sim_check
@@ -87,7 +87,8 @@ tests_pr_gradient_check_SOURCES = tests/pr_gradient_check.c \
 INCLUDES = -I$(top_srcdir)/libcrystfel/src -I$(top_srcdir)/data
 
 EXTRA_DIST += src/dw-hdfsee.h src/hdfsee.h src/render_hkl.h \
-              src/post-refinement.h src/hrs-scaling.h src/scaling-report.h
+              src/post-refinement.h src/hrs-scaling.h src/scaling-report.h \
+              src/cl-utils.h
 
 crystfeldir = $(datadir)/crystfel
 crystfel_DATA = data/diffraction.cl data/hdfsee.ui
diff --git a/Makefile.in b/Makefile.in
index 87142b72..31d9f4ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,7 +143,8 @@ src_partialator_LDADD = $(LDADD)
 src_partialator_DEPENDENCIES = $(top_builddir)/lib/libgnu.a \
 	$(top_builddir)/libcrystfel/libcrystfel.la
 am_src_pattern_sim_OBJECTS = src/pattern_sim.$(OBJEXT) \
-	src/diffraction.$(OBJEXT) src/diffraction-gpu.$(OBJEXT)
+	src/diffraction.$(OBJEXT) src/cl-utils.$(OBJEXT) \
+	src/diffraction-gpu.$(OBJEXT)
 src_pattern_sim_OBJECTS = $(am_src_pattern_sim_OBJECTS)
 src_pattern_sim_LDADD = $(LDADD)
 src_pattern_sim_DEPENDENCIES = $(top_builddir)/lib/libgnu.a \
@@ -549,7 +550,7 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 tests/first_merge_check \
 	tests/third_merge_check.hkl tests/fourth_merge_check.hkl \
 	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 \
+	src/cl-utils.h $(crystfel_DATA) doc/twin-calculator.pdf \
 	doc/examples/lcls-dec.geom \
 	doc/examples/lcls-june-r0013-r0128.geom \
 	doc/examples/lcls-xpp-estimate.geom doc/examples/simple.geom \
@@ -571,7 +572,7 @@ AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib \
 LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@ \
 	$(top_builddir)/libcrystfel/libcrystfel.la
 src_partial_sim_SOURCES = src/partial_sim.c
-src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
+src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c src/cl-utils.c \
                           src/diffraction-gpu.c
 
 @HAVE_OPENCL_TRUE@tests_gpu_sim_check_SOURCES = tests/gpu_sim_check.c src/diffraction.c \
@@ -787,6 +788,8 @@ src/pattern_sim.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/diffraction.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/cl-utils.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/diffraction-gpu.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/pattern_sim$(EXEEXT): $(src_pattern_sim_OBJECTS) $(src_pattern_sim_DEPENDENCIES) src/$(am__dirstamp)
@@ -843,6 +846,7 @@ mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f src/calibrate_detector.$(OBJEXT)
 	-rm -f src/check_hkl.$(OBJEXT)
+	-rm -f src/cl-utils.$(OBJEXT)
 	-rm -f src/compare_hkl.$(OBJEXT)
 	-rm -f src/diffraction-gpu.$(OBJEXT)
 	-rm -f src/diffraction.$(OBJEXT)
@@ -870,6 +874,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/calibrate_detector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/check_hkl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cl-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/compare_hkl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diffraction-gpu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/diffraction.Po@am__quote@
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am
index 141842ff..40846412 100644
--- a/libcrystfel/Makefile.am
+++ b/libcrystfel/Makefile.am
@@ -4,7 +4,7 @@ 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/cl-utils.c \
+                         src/reflist-utils.c src/filters.c \
                          src/render.c src/index.c src/dirax.c src/mosflm.c \
                          src/reax.c
 
@@ -13,10 +13,10 @@ 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 \
                                  src/reflist-utils.h src/thread-pool.h \
-                                 src/cl-utils.h src/filters.h \
                                  src/statistics.h src/utils.h src/detector.h \
                                  src/geometry.h src/peaks.h src/stream.h \
-                                 src/render.h src/index.h src/image.h
+                                 src/render.h src/index.h src/image.h \
+                                 src/filters.h
 
 INCLUDES = "-I$(top_srcdir)/data"
 AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib
diff --git a/libcrystfel/Makefile.in b/libcrystfel/Makefile.in
index 8992f9ed..0a03ee42 100644
--- a/libcrystfel/Makefile.in
+++ b/libcrystfel/Makefile.in
@@ -88,9 +88,8 @@ 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/cl-utils.lo \
-	src/render.lo src/index.lo src/dirax.lo src/mosflm.lo \
-	src/reax.lo
+	src/reflist-utils.lo src/filters.lo src/render.lo src/index.lo \
+	src/dirax.lo src/mosflm.lo src/reax.lo
 libcrystfel_la_OBJECTS = $(am_libcrystfel_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -351,7 +350,7 @@ 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/cl-utils.c \
+                         src/reflist-utils.c src/filters.c \
                          src/render.c src/index.c src/dirax.c src/mosflm.c \
                          src/reax.c
 
@@ -359,10 +358,10 @@ 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 \
                                  src/reflist-utils.h src/thread-pool.h \
-                                 src/cl-utils.h src/filters.h \
                                  src/statistics.h src/utils.h src/detector.h \
                                  src/geometry.h src/peaks.h src/stream.h \
-                                 src/render.h src/index.h src/image.h
+                                 src/render.h src/index.h src/image.h \
+                                 src/filters.h
 
 INCLUDES = "-I$(top_srcdir)/data"
 AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib \
@@ -455,7 +454,6 @@ src/peaks.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/reflist-utils.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/filters.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/cl-utils.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/render.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/index.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/dirax.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -470,8 +468,6 @@ mostlyclean-compile:
 	-rm -f src/beam-parameters.lo
 	-rm -f src/cell.$(OBJEXT)
 	-rm -f src/cell.lo
-	-rm -f src/cl-utils.$(OBJEXT)
-	-rm -f src/cl-utils.lo
 	-rm -f src/detector.$(OBJEXT)
 	-rm -f src/detector.lo
 	-rm -f src/dirax.$(OBJEXT)
@@ -514,7 +510,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/beam-parameters.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cell.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cl-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/detector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dirax.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/filters.Plo@am__quote@
diff --git a/libcrystfel/src/cl-utils.c b/src/cl-utils.c
index 65a09363..65a09363 100644
--- a/libcrystfel/src/cl-utils.c
+++ b/src/cl-utils.c
diff --git a/libcrystfel/src/cl-utils.h b/src/cl-utils.h
index 21a7ecd2..21a7ecd2 100644
--- a/libcrystfel/src/cl-utils.h
+++ b/src/cl-utils.h