aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-11-15 17:31:09 +0100
committerThomas White <taw@physics.org>2012-02-22 15:27:41 +0100
commit4c65ae0588c789e9f15eb1f0c324224301082263 (patch)
tree6d06f339697dc16b8556ac2b4bd8318534497429 /Makefile.in
parentd3ec66174fbfcb3780e106ca25134fd58a45506c (diff)
Separate CFLAGS and LIBS for libcrystfel and main
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 8f6f65ed..32034377 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -438,6 +438,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBCRYSTFEL_CFLAGS = @LIBCRYSTFEL_CFLAGS@
+LIBCRYSTFEL_LIBS = @LIBCRYSTFEL_LIBS@
LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
LIBOBJS = @LIBOBJS@
@@ -446,6 +448,8 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAIN_CFLAGS = @MAIN_CFLAGS@
+MAIN_LIBS = @MAIN_LIBS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
@@ -573,11 +577,11 @@ EXTRA_DIST = configure m4/gnulib-cache.m4 tests/first_merge_check \
scripts/indexed-filenames scripts/gen-sfs
SUBDIRS = lib doc/reference libcrystfel
ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall
+AM_CFLAGS = -Wall @MAIN_CFLAGS@
AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I$(top_builddir)/lib \
-I$(top_srcdir)/lib
LDADD = $(top_builddir)/lib/libgnu.a @IGNORE_UNUSED_LIBRARIES_CFLAGS@ \
- $(top_builddir)/libcrystfel/libcrystfel.la
+ $(top_builddir)/libcrystfel/libcrystfel.la @MAIN_LIBS@
src_partial_sim_SOURCES = src/partial_sim.c
src_pattern_sim_SOURCES = src/pattern_sim.c src/diffraction.c \
$(am__append_3)