projects / packages / SuiteSparse.git / blame
| Commit | Line | Data |
|---|---|---|
| 6cd4ade9 JB |
1 | --- SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk.orig 2014-12-22 23:21:00.000000000 +0100 |
| 2 | +++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2023-01-08 19:27:30.627731266 +0100 | |
| a992b9a7 JB |
3 | @@ -69,7 +69,7 @@ |
| 4 | # C and C++ compiler flags. The first three are standard for *.c and *.cpp | |
| 5 | # Add -DNTIMER if you do use any timing routines (otherwise -lrt is required). | |
| 6 | # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER | |
| 7 | - CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC | |
| 8 | +CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC | |
| 9 | # for the MKL BLAS: | |
| 10 | # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE | |
| 6cd4ade9 JB |
11 | # with no optimization: |
| 12 | @@ -86,7 +86,7 @@ MV = mv -f | |
| a992b9a7 JB |
13 | |
| 14 | # Fortran compiler (not required for 'make' or 'make library') | |
| 15 | F77 = gfortran | |
| 16 | -F77FLAGS = $(FFLAGS) -O | |
| 17 | +F77FLAGS = $(FFLAGS) | |
| 18 | F77LIB = | |
| 19 | ||
| 20 | # C and Fortran libraries. Remove -lrt if you don't have it. | |
| 6cd4ade9 | 21 | @@ -95,8 +95,10 @@ F77LIB = |
| a992b9a7 JB |
22 | # LIB = -lm |
| 23 | ||
| 24 | # For "make install" | |
| 25 | -INSTALL_LIB = /usr/local/lib | |
| 26 | -INSTALL_INCLUDE = /usr/local/include | |
| 27 | +INSTALL_PREFIX = /usr | |
| 28 | +LIB_SUBDIR = lib | |
| 29 | +INSTALL_LIB = $(INSTALL_PREFIX)/$(LIB_SUBDIR) | |
| 30 | +INSTALL_INCLUDE = $(INSTALL_PREFIX)/include/suitesparse | |
| 31 | ||
| 32 | # Which version of MAKE you are using (default is "make") | |
| 33 | # MAKE = make | |
| 6cd4ade9 JB |
34 | @@ -133,7 +133,7 @@ INSTALL_INCLUDE = $(INSTALL_PREFIX)/incl |
| 35 | # LAPACK = | |
| 36 | ||
| 37 | # OpenBLAS | |
| 38 | - BLAS = -lopenblas | |
| 39 | +BLAS = -lblas | |
| 40 | # LAPACK = | |
| 41 | ||
| 42 | # NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto" | |
| 43 | @@ -212,8 +214,8 @@ XERBLA = | |
| a992b9a7 JB |
44 | # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. |
| 45 | # You may wish to use an absolute path. METIS is optional. Compile | |
| 46 | # CHOLMOD with -DNPARTITION if you do not wish to use METIS. | |
| 47 | -METIS_PATH = ../../metis-4.0 | |
| 48 | -METIS = ../../metis-4.0/libmetis.a | |
| 49 | +METIS_PATH = /usr/include/metis | |
| 50 | +METIS = -lmetis | |
| 51 | ||
| 52 | #------------------------------------------------------------------------------ | |
| 53 | # UMFPACK configuration: |