test/Makefile.am

	- parallel/non-parallel version of macros merged
	- use CC, CXX und FC insteed of MPICC, ...

test/Makefile.am

@@ -2,7 +2,6 @@
 
 # PATH SETTING
 HDF5ROOT = @HDF5ROOT@
-PHDF5ROOT = @PHDF5ROOT@
 
 # COMPILER SETTING
 CXX = @CXX@
@@ -13,33 +12,27 @@ MPICC = @MPICC@
 
 # COMPILER FLAG SETTING
 CFLAGS = @CFLAGS@
-PCFLAGS = $(CFLAGS) -DPARALLEL_IO -DH5_HAVE_PARALLEL -DMPICH_IGNORE_CXX_SEEK
 ADDFLAGS = @ADDFLAGS@
-FFLAGS = @FFLAGS@ $(ADDFLAGS) 
-PFFLAGS = @FFLAGS@ $(CFLAGS)
+FFLAGS = @FFLAGS@ @MPIINC@ $(ADDFLAGS) 
 
 # LIBRARIES
 SZLIB = @SZLIB@
 HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
-PHDFLIB = -L$(PHDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@
 MPILIB = @MPILIB@
-LIBS = $(HDFLIB) -lm @STDCXX@
-PLIBS = -lpH5Part $(PHDFLIB) $(MPILIB) -lm @STDCXX@
+H5LIB = -L@H5P_LIB_LOC@ -lH5Part
+
+LIBS = ${H5LIB} $(HDFLIB) $(MPILIB) -lm @STDCXX@
 
 # H5Part compiled library location
 # H5PLIB = -L@prefix@/lib
-H5PLIB = -L@H5P_LIB_LOC@
 
 # INCLUDES
 HDFINC = -I$(HDF5ROOT)/include
-PHDFINC = -I$(PHDF5ROOT)/include
 MPIINC = @MPIINC@
-PINC = $(PHDFINC) $(MPIINC) $(H5PINC)
-INC = $(HDFINC) $(H5PINC)
+H5INC = -I@H5P_LIB_LOC@
+
+INC = $(HDFINC) $(MPIINC) $(H5INC)
 
-# H5Part header file location
-# H5PINC = -I@prefix@/include
-H5PINC = -I@H5P_LIB_LOC@
 
 # What to build... make install will place these files in the $(prefix)/bin directory.
 bin_PROGRAMS = @TTARGET@
@@ -54,30 +47,11 @@ EXTRA_PROGRAMS =
 # Extra files that I wish to include in the dist tar ball.
 EXTRA_DIST = Bench.c H5ecloudExample.cc H5ParallelTest.cc H5test.cc $(bin_SCRIPTS)
 
-# Listing of sources
-Bench_SOURCES = Bench.c
-
-H5PartAndreasTest_SOURCES = H5PartAndreasTest.cc
-
-H5PartTest_SOURCES = H5PartTest.cc
-
-H5PartTestP_SOURCES = H5PartTest.cc
-
-H5testF_SOURCES = H5testF.f
-
-H5testFpar_SOURCES = H5testFpar.f
-
-H5PartTestParallel_SOURCES = H5PartTestParallel.cc
-
-H5test_SOURCES = H5test.cc
-
-H5BlockTest1_SOURCES = H5BlockTest1.c
-
 # Specific building instruction (What compilers to use...)
 # ------------ Build Tests ------------
 
 Bench: Bench.c
-	$(MPICC) $(PCFLAGS) $(PINC) -o $@ $< $(H5PLIB) -lpH5Part $(PLIBS)
+	$(CC) $(CFLAGS) $(INC) -o $@ $< $(H5PLIB) -lH5Part $(LIBS)
 
 ###############################################################################
 
@@ -90,63 +64,63 @@ H5PartTest.o: H5PartTest.cc
 ###############################################################################
 
 H5PartTestP: H5PartTestP.o
-	$(MPICXX) $(PINC) -o $@ $< $(H5PLIB) -lpH5Part $(PLIBS)
+	$(CXX) $(INC) -o $@ $< $(H5LIB) -lH5Part $(LIBS)
 
 H5PartTestP.o: H5PartTest.cc
-	$(MPICXX) $(PCFLAGS) $(PINC) -DREGRESSIONTEST  -c $< -o $@
+	$(CXX) $(CFLAGS) $(INC) -DREGRESSIONTEST  -c $< -o $@
 
 ###############################################################################
 
 H5PartTestParallel: H5PartTestParallel.o
-	$(MPICXX) -o $@ $< $(H5PLIB) -lpH5Part $(PLIBS)
+	$(CXX) -o $@ $< $(H5LIB) -lH5Part $(LIBS)
 
 H5PartTestParallel.o: H5PartTestParallel.cc
-	$(MPICXX) $(PCFLAGS) $(PINC) -c $<
+	$(CXX) $(CFLAGS) $(INC) -c $<
 
 ###############################################################################
 
 H5PartAndreasTest: H5PartAndreasTest.o
-	$(MPICXX)  -o $@ $< $(H5PLIB) -lpH5Part $(PLIBS)
+	$(CXX)  -o $@ $< $(H5LIB) -lpH5Part $(LIBS)
 
 H5PartAndreasTest.o: H5PartAndreasTest.cc
-	$(MPICXX) $(PCFLAGS) $(PINC) -c $<
+	$(CXX) $(CFLAGS) $(INC) -c $<
 
 ###############################################################################
 
 H5testF: H5testF.o
-	$(FC)  -o $@ $< $(H5PLIB) -lH5PartF -lH5Part $(LIBS)
+	$(FC)  -o $@ $< $(H5LIB) -lH5PartF -lH5Part $(LIBS)
 
 H5testF.o: H5testF.f
-	$(FC) $(FFLAGS) -c $(H5PINC) $<
+	$(FC) $(FFLAGS) -c $(H5INC) $<
 
 ###############################################################################
 
 H5testFpar: H5testFpar.o
-	$(MPIFC)  -o $@ $< $(H5PLIB) -lpH5PartF -lpH5Part $(PLIBS)
+	$(MPIFC)  -o $@ $< $(H5LIB) -lpH5PartF -lpH5Part $(LIBS)
 
 H5testFpar.o: H5testFpar.f90
-	$(MPIFC) $(PFFLAGS) -c $(H5PINC) $<
+	$(MPIFC) $(FFLAGS) -c $(H5INC) $<
 
 ###############################################################################
 
 H5test: H5test.o
-	$(CXX) -o $@ -c $< $(H5PLIB) -lH5Part $(LIBS)
+	$(CXX) -o $@ -c $< $(H5LIB) -lH5Part $(LIBS)
 
 H5test.o: H5test.cc
 	$(CXX) $(CFLAGS) $(INC) -DREGRESSIONTEST -g -c $<
 
 ###############################################################################
 % : %.o
-	$(MPICC) -o $@ $< $(H5PLIB) $(PLIBS)
+	$(CC) -o $@ $< $(H5LIB) $(LIBS)
 
 H5BlockTestScalarField.o: H5BlockTestScalarField.c
 	$(CC) $(CFLAGS) $(INC) -g -c $<
 
 H5BlockTestScalarField:	H5BlockTestScalarField.o
-	$(CC) -o $@ $< $(H5PLIB) $(LIBS)
+	$(CC) -o $@ $< $(H5LIB) $(LIBS)
 
 H5BlockParTestScalarField.o: H5BlockParTestScalarField.c
-	$(MPICC) $(PCFLAGS) $(INC) -g -c $<
+	$(CC) $(CFLAGS) $(INC) -g -c $<
 
 H5BlockParTestScalarField: H5BlockParTestScalarField.o
 
@@ -154,7 +128,7 @@ H5BlockDissolveGhosts.o: H5BlockDissolveGhosts.c
 	$(CC) $(CFLAGS) $(INC) -g -c $<
 
 H5BlockDissolveGhosts: H5BlockDissolveGhosts.o
-	$(CC) -o $@ $< $(H5PLIB) $(PLIBS)
+	$(CC) -o $@ $< $(H5LIB) $(LIBS)
 
 ###############################################################################
 clean: