Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
bcefc3cd
Commit
bcefc3cd
authored
Nov 16, 2010
by
Thomas Witkowski
Browse files
Change in Makefile include file due to deimos problems.
parent
e0d865ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/other/include/Makefile_AMDiS.mk
View file @
bcefc3cd
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment