Commit a8982544 authored by Christopher Subich's avatar Christopher Subich
Browse files

Fixed typos related to winisk/kazan makefile, including

bugs preventing make_deps from working properly with
library paths
parent efa9f2af
......@@ -116,11 +116,14 @@ else
# makefile by hand (that controls the others).
pushd UFconfig
# Note, this sed uses unusual syntax because the typical separator character
# inside s -- / -- is also used as a path separator. Hence, this command
# uses # instead.
cat UFconfig.mk | sed \
-e "s/^CC.*/CC = ${CC}/" \
-e "s/^CPLUSPLUS.*/CPLUSPLUS = ${CXX}/" \
-e "s/^BLAS.*/BLAS = ${BLAS_INCDIR} ${BLAS_LIBDIR} ${BLAS_LIB}/" \
-e "s/^LAPACK.*/LAPACK = ${LAPACK_INCDIR} ${LAPACK_LIBDIR} ${LAPACK_LIB}/" \
-e "s#^CC.*#CC = ${CC}#" \
-e "s#^CPLUSPLUS.*#CPLUSPLUS = ${CXX}#" \
-e "s#^BLAS.*#BLAS = ${BLAS_INCDIR} ${BLAS_LIBDIR} ${BLAS_LIB}#" \
-e "s#^LAPACK.*#LAPACK = ${LAPACK_INCDIR} ${LAPACK_LIBDIR} ${LAPACK_LIB}#" \
> UFconfig.new
mv UFconfig.new UFconfig.mk
popd
......
......@@ -7,12 +7,12 @@ include system.mk
# Compile with debugging flags
DEBUG=true
DEBUG?=false
# Compile with optimizations
OPTIM=true
OPTIM?=true
# Compile with extra optimizations that may require significantly
# longer for compilation
SLOW_OPTIM=true
SLOW_OPTIM?=false
# Assemble the CFLAGS
CFLAGS:=$(SYSTEM_CFLAGS)
......@@ -33,7 +33,7 @@ endif
INCLUDE_DIRS := $(MPI_INCDIR) $(LAPACK_INCDIR) $(BLITZ_INCDIR) $(FFTW_INCDIR) $(UMF_INCDIR) -I../include
CFLAGS := $(CFLAGS) $(INCLUDE_DIRS)
LIB_DIRS := $(MPI_LIBDIR) $(LAPACK_LIBDIR) $(BLITZ_LIBDIR) $(FFTW_LIBDIR) $(UMF_LIBDIR) -I../lib
LIB_DIRS := $(MPI_LIBDIR) $(LAPACK_LIBDIR) $(BLITZ_LIBDIR) $(FFTW_LIBDIR) $(UMF_LIBDIR) -L../lib
LDLIBS := $(MPI_LIB) $(LAPACK_LIB) -lfftw3 -lblitz -lm -lstdc++ -lumfpack -lamd
LDFLAGS := $(LDFLAGS) $(LIB_DIRS)
......
......@@ -16,7 +16,7 @@ DEBUG_CFLAGS="-g -DBZ_DEBUG"
DEBUG_LDFLAGS=
# Compiler flags for optimization
OPTIM_CFLAGS="-O3 -fpmodel fast=2"
OPTIM_CFLAGS="-O3 -fp-model fast=2"
OPTIM_LDFLAGS=
# Compiler flags for extra optimization, such as -ip -ipo on icc
......
Supports Markdown
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