From 13bb955536b57f50cd4e4338d07c7a2e60acf4ba Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 24 Feb 2005 09:36:58 -0500 Subject: [svn-r10076] Purpose: Bug fix Description: c++/src directory was having trouble finding main HDF5 library. Solution: Replaced AM_CPPFLAGS with INCLUDES to include files in main src directory. Platforms tested: mir, modi4, verbena --- c++/src/Makefile.am | 2 +- c++/src/Makefile.in | 2 +- c++/test/Makefile.am | 2 +- c++/test/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 24c618d..daab94e 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include src directory -AM_CPPFLAGS=-I$(top_srcdir)/src +INCLUDES=-I$(top_srcdir)/src # This is our main target lib_LTLIBRARIES=libhdf5_cpp.la diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ceb89ca..7a1b894 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -194,7 +194,7 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ # Include src directory -AM_CPPFLAGS = -I$(top_srcdir)/src +INCLUDES = -I$(top_srcdir)/src # This is our main target lib_LTLIBRARIES = libhdf5_cpp.la diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 2fec0bf..34c1945 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include src, test, and c++/src directories -AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 3a6f9ae..2df0e49 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -194,7 +194,7 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ # Include src, test, and c++/src directories -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. -- cgit v0.12