diff --git a/seq_linear_solvers/amg/config/defaults.config b/seq_linear_solvers/amg/config/defaults.config index 9611b7c27..dd35e42ca 100644 --- a/seq_linear_solvers/amg/config/defaults.config +++ b/seq_linear_solvers/amg/config/defaults.config @@ -9,7 +9,7 @@ # Commands #============================================================================= -AMG_INSTALL="cp -p" +AMG_INSTALL="cp -fp" AMG_MKDIR="mkdir" export AMG_MKDIR AMG_INSTALL @@ -19,20 +19,22 @@ export AMG_MKDIR AMG_INSTALL #============================================================================= AMGTOOLS_CC="cc" +AMGTOOLS_CC_OPT="-O" +AMGTOOLS_CC_DEBUG="-g" +AMG_CC_FLAGS="" AMGTOOLS_F77="f77" -AMGTOOLS_OPT="-O" -AMGTOOLS_DEBUG="-g" AMGTOOLS_F77_OPT="-O" AMGTOOLS_F77_DEBUG="-g" +AMG_F77_FLAGS="" +AMGTOOLS_LINK="cc" +AMG_LINK_FLAGS="" AMGTOOLS_LIBS="-lm" AMGTOOLS_INCLUDE="" AMGTOOLS_MAKE="make" -export AMGTOOLS_INCLUDE AMGTOOLS_LIBS AMGTOOLS_DEF AMGTOOLS_OPT AMGTOOLS_DEBUG -export AMGTOOLS_MAKE AMGTOOLS_CC AMGTOOLS_F77 - -export AMGTOOLS_CC AMGTOOLS_F77 -export AMGTOOLS_OPT AMGTOOLS_DEBUG AMGTOOLS_F77_OPT AMGTOOLS_F77_DEBUG +export AMGTOOLS_CC AMGTOOLS_CC_OPT AMGTOOLS_CC_DEBUG AMGTOOLS_CC_FLAGS +export AMGTOOLS_F77 AMGTOOLS_F77_OPT AMGTOOLS_F77_DEBUG AMGTOOLS_F77_FLAGS +export AMGTOOLS_LINK AMG_LINK_FLAGS export AMGTOOLS_LIBS AMGTOOLS_INCLUDE AMGTOOLS_MAKE #============================================================================= @@ -40,16 +42,21 @@ export AMGTOOLS_LIBS AMGTOOLS_INCLUDE AMGTOOLS_MAKE #============================================================================= AMG_CC="cc" +AMG_CC_OPT="-O" +AMG_CC_DEBUG="-g" +AMG_CC_FLAGS="" AMG_F77="f77" -AMG_OPT="-O" -AMG_DEBUG="-g" AMG_F77_OPT="-O" AMG_F77_DEBUG="-g" +AMG_F77_FLAGS="" +AMG_LINK="f77" +AMG_LINK_FLAGS="" AMG_LIBS="-lm" AMG_INCLUDE="" AMG_MAKE="make" -export AMG_CC AMG_F77 -export AMG_OPT AMG_DEBUG AMG_F77_OPT AMG_F77_DEBUG +export AMG_CC AMG_CC_OPT AMG_CC_DEBUG AMG_CC_FLAGS +export AMG_F77 AMG_F77_OPT AMG_F77_DEBUG AMG_F77_FLAGS +export AMG_LINK AMG_LINK_FLAGS export AMG_LIBS AMG_INCLUDE AMG_MAKE diff --git a/seq_linear_solvers/amg/config/irix.config b/seq_linear_solvers/amg/config/irix.config index c32d005ff..f717c75ab 100644 --- a/seq_linear_solvers/amg/config/irix.config +++ b/seq_linear_solvers/amg/config/irix.config @@ -7,7 +7,17 @@ # Tools #============================================================================= +AMGTOOLS_LIBS="-lm" +AMGTOOLS_MAKE="gmake" + +export AMGTOOLS_LIBS AMGTOOLS_MAKE + #============================================================================= # AMG #============================================================================= +AMG_LIBS="-lm -lmpc -LF77 -lfpe" +AMG_MAKE="gmake" + +export AMG_LIBS AMG_MAKE + diff --git a/seq_linear_solvers/amg/config/solaris.config b/seq_linear_solvers/amg/config/solaris.config index ac44babf1..1618b270c 100644 --- a/seq_linear_solvers/amg/config/solaris.config +++ b/seq_linear_solvers/amg/config/solaris.config @@ -8,18 +8,24 @@ #============================================================================= AMGTOOLS_CC="gcc" -AMGTOOLS_INCLUDE="-I/usr/local/include" +AMGTOOLS_LINK="gcc" AMGTOOLS_LIBS="-L/usr/local/lib -lm" +AMGTOOLS_INCLUDE="-I/usr/local/include" -export AMGTOOLS_CC AMGTOOLS_INCLUDE AMGTOOLS_LIBS +export AMGTOOLS_CC +export AMGTOOLS_LINK +export AMGTOOLS_LIBS AMGTOOLS_INCLUDE #============================================================================= # AMG #============================================================================= AMG_CC="gcc" +AMG_LINK="f77" AMG_INCLUDE="-I/usr/local/include" AMG_LIBS="-L/usr/local/lib -lm" -export AMG_CC AMG_INCLUDE AMG_LIBS +export AMG_CC +export AMG_LINK +export AMG_LIBS AMG_INCLUDE diff --git a/seq_linear_solvers/amg/config/sunos.config b/seq_linear_solvers/amg/config/sunos.config index ac44babf1..c07e09e87 100644 --- a/seq_linear_solvers/amg/config/sunos.config +++ b/seq_linear_solvers/amg/config/sunos.config @@ -8,18 +8,26 @@ #============================================================================= AMGTOOLS_CC="gcc" -AMGTOOLS_INCLUDE="-I/usr/local/include" +AMGTOOLS_LINK="gcc" AMGTOOLS_LIBS="-L/usr/local/lib -lm" +AMGTOOLS_INCLUDE="-I/usr/local/include" -export AMGTOOLS_CC AMGTOOLS_INCLUDE AMGTOOLS_LIBS +export AMGTOOLS_CC +export AMGTOOLS_LINK +export AMGTOOLS_LIBS AMGTOOLS_INCLUDE #============================================================================= # AMG #============================================================================= AMG_CC="gcc" +AMG_F77_FLAGS="-silent" +AMG_LINK="f77" AMG_INCLUDE="-I/usr/local/include" AMG_LIBS="-L/usr/local/lib -lm" -export AMG_CC AMG_INCLUDE AMG_LIBS +export AMG_CC +export AMG_F77_FLAGS +export AMG_LINK +export AMG_LIBS AMG_INCLUDE diff --git a/seq_ls/amg/config/defaults.config b/seq_ls/amg/config/defaults.config index 9611b7c27..dd35e42ca 100644 --- a/seq_ls/amg/config/defaults.config +++ b/seq_ls/amg/config/defaults.config @@ -9,7 +9,7 @@ # Commands #============================================================================= -AMG_INSTALL="cp -p" +AMG_INSTALL="cp -fp" AMG_MKDIR="mkdir" export AMG_MKDIR AMG_INSTALL @@ -19,20 +19,22 @@ export AMG_MKDIR AMG_INSTALL #============================================================================= AMGTOOLS_CC="cc" +AMGTOOLS_CC_OPT="-O" +AMGTOOLS_CC_DEBUG="-g" +AMG_CC_FLAGS="" AMGTOOLS_F77="f77" -AMGTOOLS_OPT="-O" -AMGTOOLS_DEBUG="-g" AMGTOOLS_F77_OPT="-O" AMGTOOLS_F77_DEBUG="-g" +AMG_F77_FLAGS="" +AMGTOOLS_LINK="cc" +AMG_LINK_FLAGS="" AMGTOOLS_LIBS="-lm" AMGTOOLS_INCLUDE="" AMGTOOLS_MAKE="make" -export AMGTOOLS_INCLUDE AMGTOOLS_LIBS AMGTOOLS_DEF AMGTOOLS_OPT AMGTOOLS_DEBUG -export AMGTOOLS_MAKE AMGTOOLS_CC AMGTOOLS_F77 - -export AMGTOOLS_CC AMGTOOLS_F77 -export AMGTOOLS_OPT AMGTOOLS_DEBUG AMGTOOLS_F77_OPT AMGTOOLS_F77_DEBUG +export AMGTOOLS_CC AMGTOOLS_CC_OPT AMGTOOLS_CC_DEBUG AMGTOOLS_CC_FLAGS +export AMGTOOLS_F77 AMGTOOLS_F77_OPT AMGTOOLS_F77_DEBUG AMGTOOLS_F77_FLAGS +export AMGTOOLS_LINK AMG_LINK_FLAGS export AMGTOOLS_LIBS AMGTOOLS_INCLUDE AMGTOOLS_MAKE #============================================================================= @@ -40,16 +42,21 @@ export AMGTOOLS_LIBS AMGTOOLS_INCLUDE AMGTOOLS_MAKE #============================================================================= AMG_CC="cc" +AMG_CC_OPT="-O" +AMG_CC_DEBUG="-g" +AMG_CC_FLAGS="" AMG_F77="f77" -AMG_OPT="-O" -AMG_DEBUG="-g" AMG_F77_OPT="-O" AMG_F77_DEBUG="-g" +AMG_F77_FLAGS="" +AMG_LINK="f77" +AMG_LINK_FLAGS="" AMG_LIBS="-lm" AMG_INCLUDE="" AMG_MAKE="make" -export AMG_CC AMG_F77 -export AMG_OPT AMG_DEBUG AMG_F77_OPT AMG_F77_DEBUG +export AMG_CC AMG_CC_OPT AMG_CC_DEBUG AMG_CC_FLAGS +export AMG_F77 AMG_F77_OPT AMG_F77_DEBUG AMG_F77_FLAGS +export AMG_LINK AMG_LINK_FLAGS export AMG_LIBS AMG_INCLUDE AMG_MAKE diff --git a/seq_ls/amg/config/irix.config b/seq_ls/amg/config/irix.config index c32d005ff..f717c75ab 100644 --- a/seq_ls/amg/config/irix.config +++ b/seq_ls/amg/config/irix.config @@ -7,7 +7,17 @@ # Tools #============================================================================= +AMGTOOLS_LIBS="-lm" +AMGTOOLS_MAKE="gmake" + +export AMGTOOLS_LIBS AMGTOOLS_MAKE + #============================================================================= # AMG #============================================================================= +AMG_LIBS="-lm -lmpc -LF77 -lfpe" +AMG_MAKE="gmake" + +export AMG_LIBS AMG_MAKE + diff --git a/seq_ls/amg/config/solaris.config b/seq_ls/amg/config/solaris.config index ac44babf1..1618b270c 100644 --- a/seq_ls/amg/config/solaris.config +++ b/seq_ls/amg/config/solaris.config @@ -8,18 +8,24 @@ #============================================================================= AMGTOOLS_CC="gcc" -AMGTOOLS_INCLUDE="-I/usr/local/include" +AMGTOOLS_LINK="gcc" AMGTOOLS_LIBS="-L/usr/local/lib -lm" +AMGTOOLS_INCLUDE="-I/usr/local/include" -export AMGTOOLS_CC AMGTOOLS_INCLUDE AMGTOOLS_LIBS +export AMGTOOLS_CC +export AMGTOOLS_LINK +export AMGTOOLS_LIBS AMGTOOLS_INCLUDE #============================================================================= # AMG #============================================================================= AMG_CC="gcc" +AMG_LINK="f77" AMG_INCLUDE="-I/usr/local/include" AMG_LIBS="-L/usr/local/lib -lm" -export AMG_CC AMG_INCLUDE AMG_LIBS +export AMG_CC +export AMG_LINK +export AMG_LIBS AMG_INCLUDE diff --git a/seq_ls/amg/config/sunos.config b/seq_ls/amg/config/sunos.config index ac44babf1..c07e09e87 100644 --- a/seq_ls/amg/config/sunos.config +++ b/seq_ls/amg/config/sunos.config @@ -8,18 +8,26 @@ #============================================================================= AMGTOOLS_CC="gcc" -AMGTOOLS_INCLUDE="-I/usr/local/include" +AMGTOOLS_LINK="gcc" AMGTOOLS_LIBS="-L/usr/local/lib -lm" +AMGTOOLS_INCLUDE="-I/usr/local/include" -export AMGTOOLS_CC AMGTOOLS_INCLUDE AMGTOOLS_LIBS +export AMGTOOLS_CC +export AMGTOOLS_LINK +export AMGTOOLS_LIBS AMGTOOLS_INCLUDE #============================================================================= # AMG #============================================================================= AMG_CC="gcc" +AMG_F77_FLAGS="-silent" +AMG_LINK="f77" AMG_INCLUDE="-I/usr/local/include" AMG_LIBS="-L/usr/local/lib -lm" -export AMG_CC AMG_INCLUDE AMG_LIBS +export AMG_CC +export AMG_F77_FLAGS +export AMG_LINK +export AMG_LIBS AMG_INCLUDE