@H5P_LIB_LOC@ replaced with ${abs_top_builddir}, libstdc++ added to target H5test

This commit is contained in:
2010-04-22 15:32:35 +00:00
parent 5168a7ea04
commit ecc22ea489
+3 -3
View File
@@ -18,7 +18,7 @@ FFLAGS = @FFLAGS@ @MPIINC@
SZLIB = @SZLIB@
HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
MPILIB = @MPILIB@
H5LIB = -L@H5P_LIB_LOC@ -L@H5P_LIB_LOC@/h5_core -lH5_core -lH5
H5LIB = -L${abs_top_builddir}/src/lib -lH5Core -lH5
LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
@@ -28,7 +28,7 @@ LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
# INCLUDES
HDFINC = -I$(HDF5ROOT)/include
MPIINC = @MPIINC@
H5INC = -I@H5P_LIB_LOC@ -I@H5P_LIB_LOC@/h5
H5INC = -I${abs_top_builddir}/src/include
INC = $(HDFINC) $(MPIINC) $(H5INC)
@@ -110,7 +110,7 @@ H5testFpar.o: H5testFpar.f90
###############################################################################
H5test: H5test.o
$(CXX) -o $@ $< $(H5LIB) $(LIBS)
$(CXX) -o $@ $< $(H5LIB) -lstdc++ $(LIBS)
H5test.o: H5test.cc
$(CXX) $(CFLAGS) $(INC) -DREGRESSIONTEST -g -c $<