Update build scripts

10 files changed, 40 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 28617e06..16446702 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,2 @@
-EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \
-             src/utils.h src/diffraction.h src/detector.h \
-             src/sfac.h src/reflections.h src/list_tmp.h \
-             src/statistics.h src/displaywindow.h src/render.h src/hdfsee.h \
-             data/displaywindow.ui src/dirax.h src/peaks.h src/index.h \
-             src/filters.h src/diffraction-gpu.h src/cl-utils.h \
-             data/defs.h src/parameters-lcls.tmp \
-             data/diffraction.cl src/symmetry.h \
-             src/povray.h src/index-priv.h src/geometry.h src/templates.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 src/render_hkl.h \
-             src/stream.h src/thread-pool.h
+EXTRA_DIST = configure
 SUBDIRS = src data doc doc/examples scripts
diff --git a/Makefile.in b/Makefile.in
index cb24fdaa..5fb89822 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -196,20 +196,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = configure src/cell.h src/hdf5-file.h src/image.h \
-             src/utils.h src/diffraction.h src/detector.h \
-             src/sfac.h src/reflections.h src/list_tmp.h \
-             src/statistics.h src/displaywindow.h src/render.h src/hdfsee.h \
-             data/displaywindow.ui src/dirax.h src/peaks.h src/index.h \
-             src/filters.h src/diffraction-gpu.h src/cl-utils.h \
-             data/defs.h src/parameters-lcls.tmp \
-             data/diffraction.cl src/symmetry.h \
-             src/povray.h src/index-priv.h src/geometry.h src/templates.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 src/render_hkl.h \
-             src/stream.h src/thread-pool.h
-
+EXTRA_DIST = configure
 SUBDIRS = src data doc doc/examples scripts
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/data/Makefile.am b/data/Makefile.am
index 5a618b9e..75c18c64 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,3 +5,7 @@ crystfeldir = $(datadir)/crystfel
 crystfel_DATA = diffraction.cl defs.h sfac/Ca.nff sfac/C.nff sfac/Fe.nff \
                 sfac/H.nff sfac/Mg.nff sfac/N.nff sfac/O.nff sfac/P.nff \
                 sfac/S.nff sfac/f0_WaasKirf.dat
+
+EXTRA_DIST = sfac/Ca.nff sfac/C.nff sfac/Fe.nff sfac/H.nff  sfac/Mg.nff \
+             sfac/N.nff sfac/O.nff sfac/P.nff sfac/S.nff sfac/f0_WaasKirf.dat \
+             defs.h diffraction.cl displaywindow.ui
diff --git a/data/Makefile.in b/data/Makefile.in
index 142827aa..264646a7 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -172,6 +172,10 @@ crystfel_DATA = diffraction.cl defs.h sfac/Ca.nff sfac/C.nff sfac/Fe.nff \
                 sfac/H.nff sfac/Mg.nff sfac/N.nff sfac/O.nff sfac/P.nff \
                 sfac/S.nff sfac/f0_WaasKirf.dat
 
+EXTRA_DIST = sfac/Ca.nff sfac/C.nff sfac/Fe.nff sfac/H.nff  sfac/Mg.nff \
+             sfac/N.nff sfac/O.nff sfac/P.nff sfac/S.nff sfac/f0_WaasKirf.dat \
+             defs.h diffraction.cl displaywindow.ui
+
 all: all-am
 
 .SUFFIXES:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1f2a557c..3849333a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,7 @@
 crystfeldir = $(docdir)
 crystfel_DATA = geometry.txt indexamajig.txt pattern_sim.txt process_hkl.txt \
                 symmetry.txt twin-calculator.pdf 0-INDEX
+EXTRA_DIST = geometry.txt indexamajig.txt pattern_sim.txt process_hkl.txt \
+                symmetry.txt twin-calculator.pdf 0-INDEX \
+                examples/lcls-dec.geom examples/lcls-june-r0013-r0128.geom \
+                examples/lcls-xpp-estimate.geom examples/simple.geom
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5b03aaf3..d989900a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -169,6 +169,11 @@ crystfeldir = $(docdir)
 crystfel_DATA = geometry.txt indexamajig.txt pattern_sim.txt process_hkl.txt \
                 symmetry.txt twin-calculator.pdf 0-INDEX
 
+EXTRA_DIST = geometry.txt indexamajig.txt pattern_sim.txt process_hkl.txt \
+                symmetry.txt twin-calculator.pdf 0-INDEX \
+                examples/lcls-dec.geom examples/lcls-june-r0013-r0128.geom \
+                examples/lcls-xpp-estimate.geom examples/simple.geom
+
 all: all-am
 
 .SUFFIXES:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f852de8b..f628d16a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,3 +2,6 @@ crystfeldir = $(docdir)/scripts
 crystfel_DATA = check-near-bragg double-hit hit-rate random-image stream-split \
                 wibbletron zone-axis create-mtz frequency i0-analysis mtz2hkl \
                 sequence-image test-facetron zone-axes alternate-stream README
+EXTRA_DIST = check-near-bragg double-hit hit-rate random-image stream-split \
+             wibbletron zone-axis create-mtz frequency i0-analysis mtz2hkl \
+             sequence-image test-facetron zone-axes alternate-stream README
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 2ecd7ec1..7646cb42 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -170,6 +170,10 @@ crystfel_DATA = check-near-bragg double-hit hit-rate random-image stream-split \
                 wibbletron zone-axis create-mtz frequency i0-analysis mtz2hkl \
                 sequence-image test-facetron zone-axes alternate-stream README
 
+EXTRA_DIST = check-near-bragg double-hit hit-rate random-image stream-split \
+             wibbletron zone-axis create-mtz frequency i0-analysis mtz2hkl \
+             sequence-image test-facetron zone-axes alternate-stream README
+
 all: all-am
 
 .SUFFIXES:
diff --git a/src/Makefile.am b/src/Makefile.am
index fc9e3b07..9f9e2517 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,3 +74,10 @@ estimate_background_SOURCES = estimate_background.c stream.c utils.c cell.c
 estimate_background_LDADD = @LIBS@
 
 INCLUDES = "-I$(top_srcdir)/data"
+
+EXTRA_DIST = cell.h hdf5-file.h image.h  utils.h diffraction.h detector.h \
+             sfac.h reflections.h list_tmp.h statistics.h displaywindow.h \
+             render.h hdfsee.h dirax.h peaks.h index.h  filters.h \
+             diffraction-gpu.h cl-utils.h parameters-lcls.tmp symmetry.h \
+             povray.h index-priv.h geometry.h templates.h render_hkl.h \
+             stream.h thread-pool.h parameters.tmp
diff --git a/src/Makefile.in b/src/Makefile.in
index b4b8d63f..7e34ee08 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -320,6 +320,13 @@ reintegrate_LDADD = @LIBS@
 estimate_background_SOURCES = estimate_background.c stream.c utils.c cell.c
 estimate_background_LDADD = @LIBS@
 INCLUDES = "-I$(top_srcdir)/data"
+EXTRA_DIST = cell.h hdf5-file.h image.h  utils.h diffraction.h detector.h \
+             sfac.h reflections.h list_tmp.h statistics.h displaywindow.h \
+             render.h hdfsee.h dirax.h peaks.h index.h  filters.h \
+             diffraction-gpu.h cl-utils.h parameters-lcls.tmp symmetry.h \
+             povray.h index-priv.h geometry.h templates.h render_hkl.h \
+             stream.h thread-pool.h parameters.tmp
+
 all: all-am
 
 .SUFFIXES: