From 77d871406b15d101cae330947d72a4484eebc698 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 16 Dec 2012 14:59:54 -0500 Subject: Replace INCLUDES with AM_CFLAGS. --- libdimension-python/Makefile.am | 4 +--- libdimension/bench/Makefile.am | 4 +--- libdimension/tests/Makefile.am | 3 ++- 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 . ## ########################################################################### -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 . ## ########################################################################### -INCLUDES = -I$(top_srcdir)/libdimension +AM_CFLAGS = -I$(top_srcdir)/libdimension +AM_CXXFLAGS = $(AM_CFLAGS) check_LTLIBRARIES = libdimension-tests.la check_PROGRAMS = warning.test \ -- cgit v1.2.3