From 5027ac5fddad6a7eb872071179eb9fd92d1d281a Mon Sep 17 00:00:00 2001 From: Phil Miller Date: Fri, 7 Apr 2017 10:26:26 -0500 Subject: [PATCH] Rename internal libmetis to libckmetis, to ensure we get our copy and not a system installation Change-Id: I2ffac7106af8972d16f53594e4f9da6d4ce6cbd3 --- src/ck-ldb/libmoduleEveryLB.dep | 2 +- src/ck-ldb/libmoduleGridMetisLB.dep | 2 +- src/ck-ldb/libmoduleMetisLB.dep | 2 +- src/ck-ldb/libmoduleTeamLB.dep | 2 +- src/libs/ck-libs/ParFUM-Iterators/libmoduleParFUM_Iterators.dep | 2 +- src/libs/ck-libs/ParFUM-Tops-Dev/libmoduleParFUM_TOPS.dep | 2 +- src/libs/ck-libs/ParFUM-Tops/libmoduleParFUM_TOPS.dep | 2 +- src/libs/ck-libs/ParFUM/libmoduleParFUM.dep | 2 +- src/libs/ck-libs/fem/libmodulefem.dep | 2 +- src/libs/ck-libs/metis/libmetis/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ck-ldb/libmoduleEveryLB.dep b/src/ck-ldb/libmoduleEveryLB.dep index 4558eef008..cc07fced01 100644 --- a/src/ck-ldb/libmoduleEveryLB.dep +++ b/src/ck-ldb/libmoduleEveryLB.dep @@ -1 +1 @@ --lmetis +-lckmetis diff --git a/src/ck-ldb/libmoduleGridMetisLB.dep b/src/ck-ldb/libmoduleGridMetisLB.dep index 4558eef008..cc07fced01 100644 --- a/src/ck-ldb/libmoduleGridMetisLB.dep +++ b/src/ck-ldb/libmoduleGridMetisLB.dep @@ -1 +1 @@ --lmetis +-lckmetis diff --git a/src/ck-ldb/libmoduleMetisLB.dep b/src/ck-ldb/libmoduleMetisLB.dep index 4558eef008..cc07fced01 100644 --- a/src/ck-ldb/libmoduleMetisLB.dep +++ b/src/ck-ldb/libmoduleMetisLB.dep @@ -1 +1 @@ --lmetis +-lckmetis diff --git a/src/ck-ldb/libmoduleTeamLB.dep b/src/ck-ldb/libmoduleTeamLB.dep index 4558eef008..cc07fced01 100644 --- a/src/ck-ldb/libmoduleTeamLB.dep +++ b/src/ck-ldb/libmoduleTeamLB.dep @@ -1 +1 @@ --lmetis +-lckmetis diff --git a/src/libs/ck-libs/ParFUM-Iterators/libmoduleParFUM_Iterators.dep b/src/libs/ck-libs/ParFUM-Iterators/libmoduleParFUM_Iterators.dep index b1cda3f607..6d99f09d75 100644 --- a/src/libs/ck-libs/ParFUM-Iterators/libmoduleParFUM_Iterators.dep +++ b/src/libs/ck-libs/ParFUM-Iterators/libmoduleParFUM_Iterators.dep @@ -1 +1 @@ --module tcharm -lidxl -module ampi -lParFUM-compat -lmetis -lparmetis -module msa -module ParFUM +-module tcharm -lidxl -module ampi -lParFUM-compat -lckmetis -lparmetis -module msa -module ParFUM diff --git a/src/libs/ck-libs/ParFUM-Tops-Dev/libmoduleParFUM_TOPS.dep b/src/libs/ck-libs/ParFUM-Tops-Dev/libmoduleParFUM_TOPS.dep index b1cda3f607..6d99f09d75 100644 --- a/src/libs/ck-libs/ParFUM-Tops-Dev/libmoduleParFUM_TOPS.dep +++ b/src/libs/ck-libs/ParFUM-Tops-Dev/libmoduleParFUM_TOPS.dep @@ -1 +1 @@ --module tcharm -lidxl -module ampi -lParFUM-compat -lmetis -lparmetis -module msa -module ParFUM +-module tcharm -lidxl -module ampi -lParFUM-compat -lckmetis -lparmetis -module msa -module ParFUM diff --git a/src/libs/ck-libs/ParFUM-Tops/libmoduleParFUM_TOPS.dep b/src/libs/ck-libs/ParFUM-Tops/libmoduleParFUM_TOPS.dep index b1cda3f607..6d99f09d75 100644 --- a/src/libs/ck-libs/ParFUM-Tops/libmoduleParFUM_TOPS.dep +++ b/src/libs/ck-libs/ParFUM-Tops/libmoduleParFUM_TOPS.dep @@ -1 +1 @@ --module tcharm -lidxl -module ampi -lParFUM-compat -lmetis -lparmetis -module msa -module ParFUM +-module tcharm -lidxl -module ampi -lParFUM-compat -lckmetis -lparmetis -module msa -module ParFUM diff --git a/src/libs/ck-libs/ParFUM/libmoduleParFUM.dep b/src/libs/ck-libs/ParFUM/libmoduleParFUM.dep index f86863e65a..8a35b6d8af 100644 --- a/src/libs/ck-libs/ParFUM/libmoduleParFUM.dep +++ b/src/libs/ck-libs/ParFUM/libmoduleParFUM.dep @@ -1 +1 @@ --module tcharm -lidxl -module ampi -lParFUM-compat -lparmetis -lmetis -module msa +-module tcharm -lidxl -module ampi -lParFUM-compat -lparmetis -lckmetis -module msa diff --git a/src/libs/ck-libs/fem/libmodulefem.dep b/src/libs/ck-libs/fem/libmodulefem.dep index 522d0faa3c..0a35aae547 100644 --- a/src/libs/ck-libs/fem/libmodulefem.dep +++ b/src/libs/ck-libs/fem/libmodulefem.dep @@ -1 +1 @@ --module tcharm -lmetis -lidxl -module ampi -lfem-compat -lparmetis -module msa +-module tcharm -lckmetis -lidxl -module ampi -lfem-compat -lparmetis -module msa diff --git a/src/libs/ck-libs/metis/libmetis/Makefile b/src/libs/ck-libs/metis/libmetis/Makefile index 330e9e98ff..e3b3389dcd 100644 --- a/src/libs/ck-libs/metis/libmetis/Makefile +++ b/src/libs/ck-libs/metis/libmetis/Makefile @@ -18,7 +18,7 @@ OBJS = auxapi.o balance.o bucketsort.o checkgraph.o \ .o: $(CC) -c $*.c -DEST=$(LIBDIR)/libmetis.a +DEST=$(LIBDIR)/libckmetis.a GKlib = ../GKlib/*.o -- 2.11.4.GIT