aboutsummaryrefslogtreecommitdiff
path: root/src/libcf
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2015-03-05 18:05:27 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2015-03-05 18:05:27 -0500
commit4a3aef3f7236d2b3267aead61f11c587c6f4bddb (patch)
treebea89287f8cf6290fc230fb82fb11b3b9a5c6e0f /src/libcf
parent9166f1762976cb64acfd8c9ecc067132ffefa615 (diff)
downloadcalfuse-4a3aef3f7236d2b3267aead61f11c587c6f4bddb.tar.gz
Further improvements
Diffstat (limited to 'src/libcf')
-rw-r--r--src/libcf/Makefile.am3
-rw-r--r--src/libcf/Makefile.in7
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libcf/Makefile.am b/src/libcf/Makefile.am
index 5d45f30..d59fc62 100644
--- a/src/libcf/Makefile.am
+++ b/src/libcf/Makefile.am
@@ -32,6 +32,7 @@ libcf_la_SOURCES = \
cf_init_support.c cf_modify_hist_pha.c \
cf_fes_proc_check.c cf_fes_proc_update.c
libcf_la_LDFLAGS = -lm -lgfortran
-libcf_la_CFLAGS = $(cfitsio_CFLAGS) -I../include -I./ -I../../include
+libcf_la_CFLAGS = $(cfitsio_CFLAGS)
libcf_la_LIBADD = $(cfitsio_LIBS)
+AM_CFLAGS = -I$(top_srcdir)/include
diff --git a/src/libcf/Makefile.in b/src/libcf/Makefile.in
index 2b20728..c04b91d 100644
--- a/src/libcf/Makefile.in
+++ b/src/libcf/Makefile.in
@@ -98,7 +98,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = $(top_builddir)/src/include/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -200,7 +200,7 @@ AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
@@ -409,8 +409,9 @@ libcf_la_SOURCES = \
cf_fes_proc_check.c cf_fes_proc_update.c
libcf_la_LDFLAGS = -lm -lgfortran
-libcf_la_CFLAGS = $(cfitsio_CFLAGS) -I../include -I./ -I../../include
+libcf_la_CFLAGS = $(cfitsio_CFLAGS)
libcf_la_LIBADD = $(cfitsio_LIBS)
+AM_CFLAGS = -I$(top_srcdir)/include
all: all-am
.SUFFIXES: