Change in the MPI makefile variables

[[Imported from SVN: r1150]]

doc/comm/Makefile.am

@@ -28,5 +28,10 @@ include $(top_srcdir)/am/webstuff
 include $(top_srcdir)/am/global-rules
 
 indexset_SOURCES = indexset.cc buildindexset.hh reverse.hh
-indexset_CXXFLAGS = $(MPI_CPPFLAGS)
-indexset_LDADD = $(MPI_LDFLAGS)
+indexset_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)
+indexset_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
+indexset_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)

dune/istl/paamg/test/Makefile.am

@@ -18,26 +18,51 @@ check_PROGRAMS = $(TESTPROGS) $(NORMALTESTS)
 graphtest_SOURCES = graphtest.cc
 
 transfertest_SOURCES = transfertest.cc
-transfertest_CPPFLAGS = $(AM_CPPFLAGS) $(MPI_CPPFLAGS)
-transfertest_LDFLAGS = $(AM_LDFLAGS) $(MPI_LDFLAGS)
+transfertest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)
+transfertest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
+transfertest_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 
 galerkintest_SOURCES = galerkintest.cc anisotropic.hh
-galerkintest_CXXFLAGS = $(AM_CPPFLAGS)  $(MPI_CPPFLAGS)
-galerkintest_LDFLAGS = $(AM_LDFLAGS) $(MPI_LDFLAGS)
+galerkintest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)
+galerkintest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
+galerkintest_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 
 hierarchytest_SOURCES = hierarchytest.cc anisotropic.hh
-hierarchytest_CPPFLAGS = $(AM_CPPFLAGS) $(MPI_CPPFLAGS)
-hierarchytest_LDADD =  $(AM_LIBS) $(MPI_LIBS)
-hierarchytest_LDFLAGS = $(AM_LDFLAGS) $(MPI_LDFLAGS)
+hierarchytest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)
+hierarchytest_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
+hierarchytest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
 
 amgtest_SOURCES = amgtest.cc
 amgtest_CPPFLAGS = $(AM_CPPFLAGS) $(SUPERLU_CPPFLAGS)
 amgtest_LDFLAGS = $(AM_LDFLAGS) $(SUPERLU_LDFLAGS)
-amgtest_LDADD = $(SUPERLU_LIBS)
+amgtest_LDADD =					\
+	$(SUPERLU_LIBS)				\
+	$(LDADD)
 
 pamgtest_SOURCES = parallelamgtest.cc
-pamgtest_CPPFLAGS = $(AM_CPPFLAGS) $(MPI_CPPFLAGS) $(SUPERLU_CPPFLAGS) $(PARMETIS_CPPFLAGS)
-pamgtest_LDFLAGS = $(AM_LDFLAGS) $(MPI_LDFLAGS) $(PARMETIS_LDFLAGS)
-pamgtest_LDADD = $(MPI_LIBS)  $(PARMETIS_LIBS) $(SUPERLU_LIBS)
+pamgtest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)			\
+	$(SUPERLU_CPPFLAGS)			\
+	$(PARMETIS_CPPFLAGS)
+pamgtest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)			\
+	$(PARMETIS_LDFLAGS)
+pamgtest_LDADD =				\
+	$(PARMETIS_LIBS)			\
+	$(SUPERLU_LIBS)				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 
 include $(top_srcdir)/am/global-rules

dune/istl/test/Makefile.am

@@ -64,27 +64,58 @@ scaledidmatrixtest_SOURCES = scaledidmatrixtest.cc
 
 if MPI
   indicestest_SOURCES = indicestest.cc
-  indicestest_CXXFLAGS = $(MPI_CPPFLAGS)
-  indicestest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+  indicestest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)
+  indicestest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
+  indicestest_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 
   selectiontest_SOURCES = selectiontest.cc
-  selectiontest_CXXFLAGS = $(MPI_CPPFLAGS)
-  selectiontest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+  selectiontest_CPPFLAGS = $(AM_CPPFLAGS)	\
+	$(DUNEMPICPPFLAGS)
+  selectiontest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)
+  selectiontest_LDADD =				\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 
   indexsettest_SOURCES = indexsettest.cc
 
   syncertest_SOURCES = syncertest.cc
-  syncertest_CXXFLAGS = $(MPI_CPPFLAGS)
-  syncertest_LDFLAGS = $(DUNE_COMMON_LDFLAGS) $(DUNE_COMMON_LIBS) $(MPI_LDFLAGS) $(MPI_LIBS)
+  syncertest_CPPFLAGS = $(AM_CPPFLAGS)		\
+	$(DUNEMPICPPFLAGS)			\
+	$(DUNE_COMMON_CPPFLAGS)
+  syncertest_LDFLAGS = $(AM_LDFLAGS)		\
+	$(DUNEMPILDFLAGS)			\
+	$(DUNE_COMMON_LDFLAGS)
+  syncertest_LDADD =					\
+	$(DUNE_COMMON_LDFLAGS) $(DUNE_COMMON_LIBS)	\
+	$(DUNEMPILIBS)					\
+	$(LDADD)
 
   vectorcommtest_SOURCES = vectorcommtest.cc
-  vectorcommtest_CXXFLAGS = $(MPI_CPPFLAGS)
-  vectorcommtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+  vectorcommtest_CPPFLAGS = $(AM_CPPFLAGS)	\
+	$(DUNEMPICPPFLAGS)
+  vectorcommtest_LDFLAGS = $(AM_LDFLAGS)	\
+	$(DUNEMPILDFLAGS)
+  vectorcommtest_LDADD =			\
+	$(DUNEMPILIBS)				\
+	$(LDADD)
 endif
 
 if MPI
   matrixredisttest_SOURCES = matrixredisttest.cc
-  matrixredisttest_CXXFLAGS = ${PARMETIS_CPPFLAGS} $(MPI_CPPFLAGS)
-  matrixredisttest_LDFLAGS  = $(AM_LDFLAGS) ${PARMETIS_LDFLAGS} ${PARMETIS_LIBS} ${MPI_LDFLAGS} ${MPI_LIBS}
+  matrixredisttest_CPPFLAGS = $(AM_CPPFLAGS)	\
+	$(DUNEMPICPPFLAGS)			\
+	${PARMETIS_CPPFLAGS}
+  matrixredisttest_LDFLAGS = $(AM_LDFLAGS)	\
+	$(DUNEMPILDFLAGS)			\
+	${PARMETIS_LDFLAGS}
+  matrixredisttest_LDADD =			\
+	${PARMETIS_LDFLAGS} ${PARMETIS_LIBS}	\
+	${DUNEMPILIBS}				\
+	$(LDADD)
 endif
 include $(top_srcdir)/am/global-rules