aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-11-15 15:31:13 +0100
committerThomas White <taw@physics.org>2012-02-22 15:27:40 +0100
commit3c896e8741763b66fa056d6c8d79557225e66ad2 (patch)
treeffbb4fa21e6d9e0a7f65d5939ac2d48c9f2beb91 /Makefile.am
parent8557420ba0f50abdc1bf6245401fcd2566678f72 (diff)
Remove render_hkl --povray and remenants of cubeit
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am18
1 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 598b8ee0..5e7d8d19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,8 @@ SUBDIRS = lib doc/reference libcrystfel
ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = src/pattern_sim src/process_hkl src/get_hkl src/indexamajig \
- src/compare_hkl src/powder_plot src/render_hkl \
- src/calibrate_detector src/partialator \
- src/check_hkl src/partial_sim
+ src/compare_hkl src/powder_plot src/calibrate_detector \
+ src/partialator src/check_hkl src/partial_sim
noinst_PROGRAMS = tests/list_check tests/integration_check \
tests/pr_gradient_check tests/symmetry_check
@@ -24,6 +23,10 @@ if BUILD_HDFSEE
bin_PROGRAMS += src/hdfsee
endif
+if HAVE_CAIRO
+bin_PROGRAMS += src/render_hkl
+endif
+
AM_CFLAGS = -Wall
AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib
AM_CPPFLAGS += -I$(top_srcdir)/lib
@@ -56,7 +59,9 @@ src_check_hkl_SOURCES = src/check_hkl.c
src_powder_plot_SOURCES = src/powder_plot.c
-src_render_hkl_SOURCES = src/render_hkl.c src/povray.c
+if HAVE_CAIRO
+src_render_hkl_SOURCES = src/render_hkl.c
+endif
src_calibrate_detector_SOURCES = src/calibrate_detector.c
@@ -79,9 +84,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/povray.h \
- src/render_hkl.h src/post-refinement.h src/hrs-scaling.h \
- src/scaling-report.h
+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
crystfeldir = $(datadir)/crystfel
crystfel_DATA = data/diffraction.cl data/defs.h data/hdfsee.ui