summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-02-24 14:36:58 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-02-24 14:36:58 (GMT)
commit13bb955536b57f50cd4e4338d07c7a2e60acf4ba (patch)
treeea95841ab127566c809b6736a7f2da3c28b14ae4
parent738eb4d830f781d5e53b68e142efbb1eb6fb3eb7 (diff)
downloadhdf5-13bb955536b57f50cd4e4338d07c7a2e60acf4ba.zip
hdf5-13bb955536b57f50cd4e4338d07c7a2e60acf4ba.tar.gz
hdf5-13bb955536b57f50cd4e4338d07c7a2e60acf4ba.tar.bz2
[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
-rw-r--r--c++/src/Makefile.am2
-rw-r--r--c++/src/Makefile.in2
-rw-r--r--c++/test/Makefile.am2
-rw-r--r--c++/test/Makefile.in2
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.