Commit bcefc3cd authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Change in Makefile include file due to deimos problems.

parent e0d865ce
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment