diff -ur CHOLMOD/Demo/Makefile CHOLMOD-uf/Demo/Makefile --- CHOLMOD/Demo/Makefile 2007-05-05 16:37:46.000000000 +0200 +++ CHOLMOD-uf/Demo/Makefile 2007-12-02 17:10:39.000000000 +0100 @@ -7,7 +7,7 @@ default: all -include ../../SuiteSparse_config/SuiteSparse_config.mk +include /usr/share/misc/SuiteSparse_config.mk #------------------------------------------------------------------------------- # With METIS, CCOLAMD, CAMD, and the Partition Module: @@ -64,7 +64,7 @@ # ( cd ../../COLAMD ; $(MAKE) ) #------------------------------------------------------------------------------- -I = -I../Include -I../../SuiteSparse_config +I = -I../Include cholmod_demo: library cholmod_demo.c cholmod_demo.h $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2) diff -ur CHOLMOD/Doc/Makefile CHOLMOD-uf/Doc/Makefile --- CHOLMOD/Doc/Makefile 2007-05-03 23:32:54.000000000 +0200 +++ CHOLMOD-uf/Doc/Makefile 2007-12-02 17:10:52.000000000 +0100 @@ -1,6 +1,6 @@ default: all -include ../../SuiteSparse_config/SuiteSparse_config.mk +include /usr/share/misc/SuiteSparse_config.mk all: UserGuide.pdf --- CHOLMOD/Include/cholmod.h.orig 2012-05-29 18:45:58.000000000 +0200 +++ CHOLMOD/Include/cholmod.h 2012-06-27 18:02:23.815293493 +0200 @@ -83,7 +83,7 @@ /* assume large file support. If problems occur, compile with -DNLARGEFILE */ #include "cholmod_io64.h" -#include "SuiteSparse_config.h" +#include #include "cholmod_config.h" diff -ur CHOLMOD/Include/cholmod_internal.h CHOLMOD-uf/Include/cholmod_internal.h --- CHOLMOD/Include/cholmod_internal.h 2007-09-28 20:31:04.000000000 +0200 +++ CHOLMOD-uf/Include/cholmod_internal.h 2007-12-02 17:13:05.000000000 +0100 @@ -201,7 +201,7 @@ * It can also be redefined for other platforms, by modifying SuiteSparse_config.h. */ -#include "SuiteSparse_config.h" +#include /* -------------------------------------------------------------------------- */ /* Size_max: the largest value of size_t */ --- CHOLMOD/Lib/Makefile.orig 2013-04-15 22:11:51.000000000 +0200 +++ CHOLMOD/Lib/Makefile 2013-04-20 07:40:54.087771768 +0200 @@ -6,45 +6,38 @@ ccode: all -include ../../SuiteSparse_config/SuiteSparse_config.mk +include /usr/share/misc/SuiteSparse_config.mk #------------------------------------------------------------------------------- # the optional Partition module requires METIS, CAMD, and CCOLAMD. # CAMD and CCOLAMD can be installed without METIS, but are optional. I_WITH_PARTITION = LIB_WITH_PARTITION = -CONFIG = -DNPARTITION -DNCAMD +CONFIG = -DNPARTITION # check if CAMD/CCOLAMD and METIS are requested and available ifeq (,$(findstring -DNCAMD, $(CHOLMOD_CONFIG))) - # CAMD and CCOLAMD are requested. See if they are available - ifeq (../../CAMD, $(wildcard ../../CAMD)) - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD)) + # CAMD and CCOLAMD are requested. Assume they are available # CAMD and CCOLAMD are requested and available LIB_WITH_PARTITION = \ - ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a + -lccolamd -lcamd I_WITH_PARTITION = \ - -I../../CCOLAMD/Include -I../../CAMD/Include + -I/usr/include/ccolamd -I/usr/include/camd CONFIG = -DNPARTITION # check if METIS is requested and available ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG))) - # METIS is requested. See if it is available - ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH))) + # METIS is requested. Assume it is available # METIS is available - LIB_WITH_PARTITION = $(METIS) \ - ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a - I_WITH_PARTITION = -I$(METIS_PATH)/Lib \ - -I../../CCOLAMD/Include -I../../CAMD/Include + LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd + I_WITH_PARTITION = -I/usr/include/metis \ + -I/usr/include/ccolamd -I/usr/include/camd CONFIG = - endif endif - endif - endif endif #------------------------------------------------------------------------------- -I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \ - $(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config +I = -I/usr/include/amd -I/usr/include/colamd \ + $(I_WITH_PARTITION) -I../Include #------------------------------------------------------------------------------- diff -ur CHOLMOD/Makefile CHOLMOD-uf/Makefile --- CHOLMOD/Makefile 2006-11-30 17:40:08.000000000 +0100 +++ CHOLMOD-uf/Makefile 2007-12-02 17:12:17.000000000 +0100 @@ -7,7 +7,7 @@ default: all -include ../SuiteSparse_config/SuiteSparse_config.mk +include /usr/share/misc/SuiteSparse_config.mk # Compile the C-callable libraries and the Demo programs. all: diff -ur CHOLMOD/MATLAB/cholmod_matlab.h CHOLMOD-uf/MATLAB/cholmod_matlab.h --- CHOLMOD/MATLAB/cholmod_matlab.h 2007-06-14 19:52:47.000000000 +0200 +++ CHOLMOD-uf/MATLAB/cholmod_matlab.h 2007-12-02 17:13:28.000000000 +0100 @@ -4,7 +4,7 @@ /* Shared prototypes and definitions for CHOLMOD mexFunctions */ -#include "SuiteSparse_config.h" +#include #ifndef DLONG #define DLONG #endif diff -ur CHOLMOD/Tcov/Makefile CHOLMOD-uf/Tcov/Makefile --- CHOLMOD/Tcov/Makefile 2007-05-05 19:12:46.000000000 +0200 +++ CHOLMOD-uf/Tcov/Makefile 2007-12-02 17:11:45.000000000 +0100 @@ -5,7 +5,7 @@ # If you compile CHOLMOD with -DNPARTITION, then you do not need METIS, # CCOLAMD, or the Partition module. -include ../../SuiteSparse_config/SuiteSparse_config.mk +include /usr/share/misc/SuiteSparse_config.mk include Make.inc # Tcov requires gcc @@ -31,7 +31,7 @@ I = -I../../AMD/Include -I../../COLAMD/Include \ -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \ - -I../Include -I../../SuiteSparse_config + -I../Include default: cm cl z_demo l_demo cmread clread