First round of build system improvements

1 files changed, 24 insertions, 23 deletions

diff --git a/Makefile.in b/Makefile.in
index 1a98404e..1d3fa61c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,8 +44,8 @@ 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) $(am__EXEEXT_3)
 TESTS = tests/list_check$(EXEEXT) $(am__EXEEXT_3)
-@HAVE_GTK_TRUE@am__append_1 = src/hdfsee
-@HAVE_CAIRO_TRUE@am__append_2 = src/cubeit
+@BUILD_HDFSEE_TRUE@am__append_1 = src/hdfsee
+@BUILD_CUBEIT_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 = tests/gpu_sim_check
 @HAVE_OPENCL_TRUE@am__append_5 = tests/gpu_sim_check
@@ -76,8 +76,8 @@ 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_CAIRO_TRUE@am__EXEEXT_2 = src/cubeit$(EXEEXT)
+@BUILD_HDFSEE_TRUE@am__EXEEXT_1 = src/hdfsee$(EXEEXT)
+@BUILD_CUBEIT_TRUE@am__EXEEXT_2 = src/cubeit$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(crystfeldir)" \
 	"$(DESTDIR)$(crystfeldocdir)" "$(DESTDIR)$(scriptdir)"
 @HAVE_OPENCL_TRUE@am__EXEEXT_3 = tests/gpu_sim_check$(EXEEXT)
@@ -107,13 +107,13 @@ src_compare_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am__src_cubeit_SOURCES_DIST = src/cubeit.c src/cell.c src/hdf5-file.c \
 	src/utils.c src/detector.c src/render.c src/filters.c \
 	src/image.c src/symmetry.c src/stream.c src/thread-pool.c
-@HAVE_CAIRO_TRUE@am_src_cubeit_OBJECTS = src/cubeit.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/utils.$(OBJEXT) src/detector.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/render.$(OBJEXT) src/filters.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/image.$(OBJEXT) src/symmetry.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/stream.$(OBJEXT) \
-@HAVE_CAIRO_TRUE@	src/thread-pool.$(OBJEXT)
+@BUILD_CUBEIT_TRUE@am_src_cubeit_OBJECTS = src/cubeit.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/cell.$(OBJEXT) src/hdf5-file.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/utils.$(OBJEXT) src/detector.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/render.$(OBJEXT) src/filters.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/image.$(OBJEXT) src/symmetry.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/stream.$(OBJEXT) \
+@BUILD_CUBEIT_TRUE@	src/thread-pool.$(OBJEXT)
 src_cubeit_OBJECTS = $(am_src_cubeit_OBJECTS)
 src_cubeit_LDADD = $(LDADD)
 src_cubeit_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -135,12 +135,13 @@ src_get_hkl_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
 am__src_hdfsee_SOURCES_DIST = src/hdfsee.c src/dw-hdfsee.c \
 	src/render.c src/hdf5-file.c src/utils.c src/image.c \
 	src/filters.c src/thread-pool.c src/detector.c
-@HAVE_GTK_TRUE@am_src_hdfsee_OBJECTS = src/hdfsee.$(OBJEXT) \
-@HAVE_GTK_TRUE@	src/dw-hdfsee.$(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) \
-@HAVE_GTK_TRUE@	src/detector.$(OBJEXT)
+@BUILD_HDFSEE_TRUE@am_src_hdfsee_OBJECTS = src/hdfsee.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/dw-hdfsee.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/render.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/hdf5-file.$(OBJEXT) src/utils.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/image.$(OBJEXT) src/filters.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/thread-pool.$(OBJEXT) \
+@BUILD_HDFSEE_TRUE@	src/detector.$(OBJEXT)
 src_hdfsee_OBJECTS = $(am_src_hdfsee_OBJECTS)
 src_hdfsee_LDADD = $(LDADD)
 src_hdfsee_DEPENDENCIES = $(top_builddir)/lib/libgnu.a
@@ -625,9 +626,9 @@ src_indexamajig_SOURCES = src/indexamajig.c src/hdf5-file.c \
 	src/dirax.c src/mosflm.c src/reflections.c src/symmetry.c \
 	src/geometry.c src/thread-pool.c src/beam-parameters.c \
 	src/reflist.c $(am__append_6)
-@HAVE_GTK_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.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/detector.c
+@BUILD_HDFSEE_TRUE@src_hdfsee_SOURCES = src/hdfsee.c src/dw-hdfsee.c src/render.c \
+@BUILD_HDFSEE_TRUE@                     src/hdf5-file.c src/utils.c src/image.c src/filters.c \
+@BUILD_HDFSEE_TRUE@                     src/thread-pool.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 \
@@ -665,9 +666,9 @@ src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
                           src/symmetry.c src/post-refinement.c \
                           src/hrs-scaling.c src/reflist.c
 
-@HAVE_CAIRO_TRUE@src_cubeit_SOURCES = src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c \
-@HAVE_CAIRO_TRUE@                     src/detector.c src/render.c src/filters.c src/image.c \
-@HAVE_CAIRO_TRUE@                     src/symmetry.c src/stream.c src/thread-pool.c
+@BUILD_CUBEIT_TRUE@src_cubeit_SOURCES = src/cubeit.c src/cell.c src/hdf5-file.c src/utils.c \
+@BUILD_CUBEIT_TRUE@                     src/detector.c src/render.c src/filters.c src/image.c \
+@BUILD_CUBEIT_TRUE@                     src/symmetry.c src/stream.c src/thread-pool.c
 
 src_reintegrate_SOURCES = src/reintegrate.c src/cell.c src/hdf5-file.c \
                           src/utils.c src/detector.c src/peaks.c src/image.c \