]>
Commit | Line | Data |
---|---|---|
28d891a0 JB |
1 | --- SuiteSparse_config/SuiteSparse_config.mk.orig 2014-08-16 21:22:58.000000000 +0200 |
2 | +++ SuiteSparse_config/SuiteSparse_config.mk 2014-10-01 17:06:23.286761684 +0200 | |
3 | @@ -69,7 +69,7 @@ | |
bbe02881 | 4 | # C and C++ compiler flags. The first three are standard for *.c and *.cpp |
127eb201 JB |
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 | |
bbe02881 | 8 | +CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC |
28d891a0 JB |
9 | # for the MKL BLAS: |
10 | # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE | |
bbe02881 | 11 | |
28d891a0 | 12 | @@ -84,7 +84,7 @@ |
bbe02881 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 | ||
127eb201 | 20 | # C and Fortran libraries. Remove -lrt if you don't have it. |
28d891a0 | 21 | @@ -93,8 +93,9 @@ |
127eb201 | 22 | # LIB = -lm |
50516a28 JB |
23 | |
24 | # For "make install" | |
25 | -INSTALL_LIB = /usr/local/lib | |
26 | -INSTALL_INCLUDE = /usr/local/include | |
27 | +INSTALL_PREFIX = /usr | |
28 | +INSTALL_LIB = $(INSTALL_PREFIX)/lib | |
29 | +INSTALL_INCLUDE = $(INSTALL_PREFIX)/include | |
30 | ||
127eb201 JB |
31 | # Which version of MAKE you are using (default is "make") |
32 | # MAKE = make | |
28d891a0 | 33 | @@ -210,8 +211,8 @@ |
fa448bb4 JR |
34 | # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. |
35 | # You may wish to use an absolute path. METIS is optional. Compile | |
36 | # CHOLMOD with -DNPARTITION if you do not wish to use METIS. | |
37 | -METIS_PATH = ../../metis-4.0 | |
38 | -METIS = ../../metis-4.0/libmetis.a | |
39 | +METIS_PATH = /usr/include/metis | |
40 | +METIS = -lmetis | |
41 | ||
bbe02881 JB |
42 | #------------------------------------------------------------------------------ |
43 | # UMFPACK configuration: |