From bcefc3cd7b4c0eefe3d35bdde6cac3523c7d7ea8 Mon Sep 17 00:00:00 2001 From: Thomas Witkowski <thomas.witkowski@gmx.de> Date: Tue, 16 Nov 2010 09:57:03 +0000 Subject: [PATCH] Change in Makefile include file due to deimos problems. --- AMDiS/other/include/Makefile_AMDiS.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AMDiS/other/include/Makefile_AMDiS.mk b/AMDiS/other/include/Makefile_AMDiS.mk index 83eb8943..6707d314 100644 --- a/AMDiS/other/include/Makefile_AMDiS.mk +++ b/AMDiS/other/include/Makefile_AMDiS.mk @@ -18,6 +18,7 @@ INCLUDES = -I. $(AMDIS_INCLUDE) $(MPCCI_INCLUDE) $(REINIT_INCLUDE) $(PARALLEL_IN AMDIS_LIB = -L$(AMDIS_DIR)/lib -lamdis -lcompositeFEM PNG_LIB = +LIBS = UMFPACK_LIB = -L$(AMDIS_DIR)/lib/AMD/Lib -L$(AMDIS_DIR)/lib/UMFPACK/Lib ifeq ($(strip $(USE_SERVER)), mars) @@ -27,6 +28,7 @@ else UMFPACK_LIB += $(MKL_LIB) -lmkl -lguide -lpthread -lumfpack -lamd else ifeq ($(strip $(USE_SERVER)), deimos) + LIBS += -L/fastfs/wir/local/lib MPI_DIR = /licsoft/libraries/openmpi/1.2.6/64bit UMFPACK_LIB += -lumfpack -lamd -L/licsoft/libraries/goto -lgoto -lpthread else @@ -38,7 +40,7 @@ endif MPCCI_LIB = -L$(MPCCI_DIR)/lib/linux-x86-glibc22 -lmpcci PARMETIS_LIB = -L$(PARMETIS_DIR) -lparmetis -lmetis -LIBS = $(AMDIS_LIB) $(PNG_LIB) +LIBS += $(AMDIS_LIB) $(PNG_LIB) LIBS += -lboost_iostreams -lboost_filesystem -lboost_system -lboost_date_time ifeq ($(strip $(USE_UMFPACK)), 1) -- GitLab