From 23ee32eda8efb5a384c48849c75d33631965ab1b Mon Sep 17 00:00:00 2001 From: "Peter W. Draper" <p.w.draper@durham.ac.uk> Date: Mon, 17 Aug 2015 16:33:45 +0100 Subject: [PATCH] Use the HDF5_CPPFLAGS set by the AX_LIB_HDF5 macro These are needed when the environment CFLAGS do not point at the HDF5 include directory. Use CPPFLAGS as CFLAGS is not set Former-commit-id: cd1da96aeecf3e8abce21946d0b1168ae6159e53 --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index b71586a776..0ae3cbba9d 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -20,7 +20,7 @@ MYFLAGS = -DTIMER # Add the source directory and debug to CFLAGS -AM_CFLAGS = -Wall -Werror -I../src -DCPU_TPS=2.67e9 +AM_CFLAGS = -Wall -Werror -I../src -DCPU_TPS=2.67e9 $(HDF5_CPPFLAGS) AM_LDFLAGS = diff --git a/src/Makefile.am b/src/Makefile.am index 5b5a3787d6..1eda1b81bf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Add the debug flag to the whole thing -AM_CFLAGS = -DTIMER -DCOUNTER -DCPU_TPS=2.30e9 +AM_CFLAGS = -DTIMER -DCOUNTER -DCPU_TPS=2.30e9 $(HDF5_CPPFLAGS) # Assign a "safe" version number AM_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(HDF5_LDFLAGS) -version-info 0:0:0 # -fsanitize=address -- GitLab