summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2012-12-16 14:59:54 -0500
committerTavian Barnes <tavianator@tavianator.com>2012-12-16 14:59:54 -0500
commit77d871406b15d101cae330947d72a4484eebc698 (patch)
treebbfc30d386d5df02b5d82e33c0835bb31dc2b51c
parentb2c3b538298f650e4d1dfb522d52de31de9be645 (diff)
downloaddimension-77d871406b15d101cae330947d72a4484eebc698.tar.xz
Replace INCLUDES with AM_CFLAGS.
-rw-r--r--libdimension-python/Makefile.am4
-rw-r--r--libdimension/bench/Makefile.am4
-rw-r--r--libdimension/tests/Makefile.am3
3 files changed, 4 insertions, 7 deletions
diff --git a/libdimension-python/Makefile.am b/libdimension-python/Makefile.am
index b20169b..7070b70 100644
--- a/libdimension-python/Makefile.am
+++ b/libdimension-python/Makefile.am
@@ -20,9 +20,7 @@
SUBDIRS = . \
tests
-INCLUDES = -I$(top_srcdir)/libdimension
-
-AM_CFLAGS = $(Python_CFLAGS)
+AM_CFLAGS = $(Python_CFLAGS) -I$(top_srcdir)/libdimension
AM_LDFLAGS = $(Python_LDFLAGS)
dimension.c: dimension.pyx dimension.pxd
diff --git a/libdimension/bench/Makefile.am b/libdimension/bench/Makefile.am
index 9ac3607..09530ff 100644
--- a/libdimension/bench/Makefile.am
+++ b/libdimension/bench/Makefile.am
@@ -17,14 +17,12 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ##
###########################################################################
-INCLUDES = -I$(top_srcdir)/libdimension
-
EXTRA_PROGRAMS = array.bench \
geometry.bench \
polynomial.bench \
prtree.bench
-AM_CFLAGS = $(libsandglass_CFLAGS) -fno-inline
+AM_CFLAGS = $(libsandglass_CFLAGS) -fno-inline -I$(top_srcdir)/libdimension
AM_LDFLAGS = $(libsandglass_LIBS) $(top_builddir)/libdimension/libdimension.la
array_bench_SOURCES = array.c
diff --git a/libdimension/tests/Makefile.am b/libdimension/tests/Makefile.am
index 04d7aeb..072a111 100644
--- a/libdimension/tests/Makefile.am
+++ b/libdimension/tests/Makefile.am
@@ -17,7 +17,8 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ##
###########################################################################
-INCLUDES = -I$(top_srcdir)/libdimension
+AM_CFLAGS = -I$(top_srcdir)/libdimension
+AM_CXXFLAGS = $(AM_CFLAGS)
check_LTLIBRARIES = libdimension-tests.la
check_PROGRAMS = warning.test \