aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-06-25 17:56:45 +0200
committerThomas White <taw@physics.org>2015-06-25 18:19:58 +0200
commit0a7dcfd71ae2c267ac748c43637e27aef403db7e (patch)
treea3444b4fc22bc16170cf2e4211aad7d409ab37a1
parent33a0ef4d46dff8281743359697178085fa551049 (diff)
Move predict-refine to libcrystfel
-rw-r--r--Makefile.am4
-rw-r--r--libcrystfel/Makefile.am4
-rw-r--r--libcrystfel/src/predict-refine.c (renamed from src/predict-refine.c)0
-rw-r--r--libcrystfel/src/predict-refine.h (renamed from src/predict-refine.h)0
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index da210d47..bc1058fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@ src_process_hkl_SOURCES = src/process_hkl.c
src_list_events_SOURCES = src/list_events.c
src_indexamajig_SOURCES = src/indexamajig.c src/im-sandbox.c \
- src/process_image.c src/predict-refine.c
+ src/process_image.c
if BUILD_HDFSEE
src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/hdfsee-render.c
@@ -133,7 +133,7 @@ EXTRA_DIST += src/dw-hdfsee.h src/hdfsee.h src/render_hkl.h \
src/cl-utils.h src/hdfsee-render.h src/diffraction.h \
src/diffraction-gpu.h src/pattern_sim.h src/list_tmp.h \
src/im-sandbox.h src/process_image.h src/multihistogram.h \
- src/rejection.h src/predict-refine.h
+ src/rejection.h
crystfeldir = $(datadir)/crystfel
crystfel_DATA = data/diffraction.cl data/hdfsee.ui
diff --git a/libcrystfel/Makefile.am b/libcrystfel/Makefile.am
index 8e5acaaf..1a0c3efe 100644
--- a/libcrystfel/Makefile.am
+++ b/libcrystfel/Makefile.am
@@ -9,7 +9,7 @@ libcrystfel_la_SOURCES = src/reflist.c src/utils.c src/cell.c src/detector.c \
src/reflist-utils.c src/filters.c \
src/render.c src/index.c src/dirax.c src/mosflm.c \
src/cell-utils.c src/integer_matrix.c src/crystal.c \
- src/xds.c src/integration.c \
+ src/xds.c src/integration.c src/predict-refine.c \
src/histogram.c src/events.c
if HAVE_FFTW
@@ -28,7 +28,7 @@ libcrystfel_la_include_HEADERS = ${top_srcdir}/version.h \
src/filters.h src/dirax.h src/mosflm.h \
src/cell-utils.h \
src/integer_matrix.h src/crystal.h \
- src/xds.h \
+ src/xds.h src/predict-refine.h \
src/integration.h src/histogram.h \
src/events.h src/asdf.h
diff --git a/src/predict-refine.c b/libcrystfel/src/predict-refine.c
index 2d845feb..2d845feb 100644
--- a/src/predict-refine.c
+++ b/libcrystfel/src/predict-refine.c
diff --git a/src/predict-refine.h b/libcrystfel/src/predict-refine.h
index c763d2ca..c763d2ca 100644
--- a/src/predict-refine.h
+++ b/libcrystfel/src/predict-refine.h