aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-05-25 17:52:21 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:27 +0100
commitfa2c2dcf80cc3510aab0e0b8f6ed9fb6c020687a (patch)
tree11436205e748e9bc740cfa6fe49f1aee9adaa688
parent69d3c604a3cc5ac9c6cba2ce1710761a7d8c0aae (diff)
Fussiness
-rw-r--r--Makefile.am7
-rw-r--r--Makefile.in7
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index f42e68b1..e1ff7441 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,8 @@ bin_PROGRAMS += src/cubeit
endif
AM_CFLAGS = -Wall
-AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib
+AM_CPPFLAGS += -I$(top_srcdir)/lib
LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@
src_partial_sim_SOURCES = src/partial_sim.c src/cell.c src/detector.c \
@@ -107,8 +108,8 @@ src_sum_stack_SOURCES = src/sum_stack.c src/utils.c src/hdf5-file.c \
src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.c \
src/hdf5-file.c src/image.c src/thread-pool.c \
src/detector.c src/stream.c src/cell.c \
- src/reflist-utils.c src/reflist.c src/symmetry.c \
- src/peaks.c
+ src/reflist-utils.c src/reflist.c \
+ src/symmetry.c src/peaks.c
src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/utils.c src/detector.c src/peaks.c src/image.c \
diff --git a/Makefile.in b/Makefile.in
index 296e92e0..1efd5f8c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -619,7 +619,8 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 tests/first_merge_check \
SUBDIRS = lib doc/reference
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Wall
-AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib
LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@
src_partial_sim_SOURCES = src/partial_sim.c src/cell.c src/detector.c \
src/beam-parameters.c src/thread-pool.c src/utils.c \
@@ -682,8 +683,8 @@ src_sum_stack_SOURCES = src/sum_stack.c src/utils.c src/hdf5-file.c \
src_calibrate_detector_SOURCES = src/calibrate_detector.c src/utils.c \
src/hdf5-file.c src/image.c src/thread-pool.c \
src/detector.c src/stream.c src/cell.c \
- src/reflist-utils.c src/reflist.c src/symmetry.c \
- src/peaks.c
+ src/reflist-utils.c src/reflist.c \
+ src/symmetry.c src/peaks.c
src_partialator_SOURCES = src/partialator.c src/cell.c src/hdf5-file.c \
src/utils.c src/detector.c src/peaks.c src/image.c \