From 1b7c8926f34e360a4509f4b8f4c65131181482e8 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Tue, 29 Apr 2014 11:20:39 +0200
Subject: [PATCH] Revert "[autotools] Use METIS flags where appropriate."
This reverts commit 6132d0df82c635597f464ca28be64a8e01c1051e.
It (METIS) does not seem needed for compilation and the patch
forced the user and downstream modules to add additional compile
and linker flags.
---
dune/istl/paamg/test/Makefile.am | 14 ++++----------
dune/istl/test/Makefile.am | 7 ++-----
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/dune/istl/paamg/test/Makefile.am b/dune/istl/paamg/test/Makefile.am
index d45a912a..420f17bf 100644
--- a/dune/istl/paamg/test/Makefile.am
+++ b/dune/istl/paamg/test/Makefile.am
@@ -87,15 +87,12 @@ pamgtest_SOURCES = parallelamgtest.cc
pamgtest_CPPFLAGS = $(AM_CPPFLAGS) \
$(DUNEMPICPPFLAGS) \
$(SUPERLU_CPPFLAGS) \
- $(PARMETIS_CPPFLAGS) \
- $(METIS_CPPFLAGS)
+ $(PARMETIS_CPPFLAGS)
pamgtest_LDFLAGS = $(AM_LDFLAGS) \
$(DUNEMPILDFLAGS) \
- $(PARMETIS_LDFLAGS) \
- $(METIS_LDFLAGS)
+ $(PARMETIS_LDFLAGS)
pamgtest_LDADD = \
$(PARMETIS_LIBS) \
- $(METIS_LIBS) \
$(SUPERLU_LIBS) \
$(DUNEMPILIBS) \
$(LDADD)
@@ -104,15 +101,12 @@ pamg_comm_repart_test_SOURCES = parallelamgtest.cc
pamg_comm_repart_test_CPPFLAGS = $(AM_CPPFLAGS) \
$(DUNEMPICPPFLAGS) \
$(SUPERLU_CPPFLAGS) \
- $(PARMETIS_CPPFLAGS) -DAMG_REPART_ON_COMM_GRAPH \
- $(METIS_CPPFLAGS)
+ $(PARMETIS_CPPFLAGS) -DAMG_REPART_ON_COMM_GRAPH
pamg_comm_repart_test_LDFLAGS = $(AM_LDFLAGS) \
$(DUNEMPILDFLAGS) \
- $(PARMETIS_LDFLAGS) \
- $(METIS_LDFLAGS)
+ $(PARMETIS_LDFLAGS)
pamg_comm_repart_test_LDADD = \
$(PARMETIS_LIBS) \
- $(METIS_LIBS) \
$(SUPERLU_LIBS) \
$(DUNEMPILIBS) \
$(LDADD)
diff --git a/dune/istl/test/Makefile.am b/dune/istl/test/Makefile.am
index 282a68cc..03556a28 100644
--- a/dune/istl/test/Makefile.am
+++ b/dune/istl/test/Makefile.am
@@ -158,15 +158,12 @@ if MPI
matrixredisttest_SOURCES = matrixredisttest.cc
matrixredisttest_CPPFLAGS = $(AM_CPPFLAGS) \
$(DUNEMPICPPFLAGS) \
- ${PARMETIS_CPPFLAGS} \
- ${METIS_CPPFLAGS}
+ ${PARMETIS_CPPFLAGS}
matrixredisttest_LDFLAGS = $(AM_LDFLAGS) \
$(DUNEMPILDFLAGS) \
- ${PARMETIS_LDFLAGS} \
- ${METIS_LDFLAGS}
+ ${PARMETIS_LDFLAGS}
matrixredisttest_LDADD = \
${PARMETIS_LDFLAGS} ${PARMETIS_LIBS} \
- ${METIS_LDFLAGS} ${METIS_LIBS} \
${DUNEMPILIBS} \
$(LDADD)
endif
--
GitLab