summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2002-03-07 23:54:01 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2002-03-07 23:54:01 (GMT)
commit0b0630530c95b57042463ebd9d2741b94fb9d4dc (patch)
tree8db8dc8f494361c9a1289d7a539cf320c817e981
parent6ab96eaf7abd5a50dcc90937238ab5da26236d70 (diff)
downloadhdf5-0b0630530c95b57042463ebd9d2741b94fb9d4dc.zip
hdf5-0b0630530c95b57042463ebd9d2741b94fb9d4dc.tar.gz
hdf5-0b0630530c95b57042463ebd9d2741b94fb9d4dc.tar.bz2
[svn-r5049] Purpose:
Bug Fix Description: Needed more -I flags to catch some of the include files. Solution: Added them. Cleaned up the way include files and -D defines were specified in the Makefile. Platforms tested: Linux
-rw-r--r--pablo/Makefile.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/pablo/Makefile.in b/pablo/Makefile.in
index 5e1fbab..9571d48 100644
--- a/pablo/Makefile.in
+++ b/pablo/Makefile.in
@@ -19,11 +19,14 @@ TRACE=$(PERL) $(top_srcdir)/bin/trace
## PABLO_MPIO_FLAGS.
###############################################################################
PARALLEL_PABLO=@PARALLEL_PABLO@
+
PABLO_MPIO_FLAGS=${PARALLEL_PABLO:yes=-DH5_HAVE_PARALLEL -DH5_HAVE_MPIOTRACE}
-PABLO_FLAGS=-I$(top_srcdir)/src -DH5_HAVE_PABLO $(PABLO_MPIO_FLAGS)
+PABLO_INC=-I$(top_srcdir)/src -I$(top_srcdir)/pablo -I$(top_builddir)/src -I.
+PABLO_DEFS=-DH5_HAVE_PABLO -DH5_DEBUG_API -DNDEBUG -D$(PABLO_BLD)_BUILD
+
+PABLO_FLAGS=$(PABLO_DEFS) $(PABLO_MPIO_FLAGS) $(PABLO_INC)
-CPPFLAGS=-I. -I$(top_srcdir)/src -DH5_DEBUG_API -DNDEBUG $(PABLO_FLAGS) \
- -D$(PABLO_BLD)_BUILD @CPPFLAGS@
+CPPFLAGS=$(PABLO_FLAGS) @CPPFLAGS@
## This is our main target:
LIB=libhdf5-inst.a