1 diff -ur CHOLMOD/Demo/Makefile CHOLMOD-uf/Demo/Makefile
2 --- CHOLMOD/Demo/Makefile 2007-05-05 16:37:46.000000000 +0200
3 +++ CHOLMOD-uf/Demo/Makefile 2007-12-02 17:10:39.000000000 +0100
8 -include ../../SuiteSparse_config/SuiteSparse_config.mk
9 +include /usr/share/misc/SuiteSparse_config.mk
11 #-------------------------------------------------------------------------------
12 # With METIS, CCOLAMD, CAMD, and the Partition Module:
14 # ( cd ../../COLAMD ; $(MAKE) )
15 #-------------------------------------------------------------------------------
17 -I = -I../Include -I../../SuiteSparse_config
20 cholmod_demo: library cholmod_demo.c cholmod_demo.h
21 $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
22 diff -ur CHOLMOD/Doc/Makefile CHOLMOD-uf/Doc/Makefile
23 --- CHOLMOD/Doc/Makefile 2007-05-03 23:32:54.000000000 +0200
24 +++ CHOLMOD-uf/Doc/Makefile 2007-12-02 17:10:52.000000000 +0100
28 -include ../../SuiteSparse_config/SuiteSparse_config.mk
29 +include /usr/share/misc/SuiteSparse_config.mk
33 --- CHOLMOD/Include/cholmod.h.orig 2012-05-29 18:45:58.000000000 +0200
34 +++ CHOLMOD/Include/cholmod.h 2012-06-27 18:02:23.815293493 +0200
36 /* assume large file support. If problems occur, compile with -DNLARGEFILE */
37 #include "cholmod_io64.h"
39 -#include "SuiteSparse_config.h"
40 +#include <SuiteSparse_config.h>
42 #include "cholmod_config.h"
44 diff -ur CHOLMOD/Include/cholmod_internal.h CHOLMOD-uf/Include/cholmod_internal.h
45 --- CHOLMOD/Include/cholmod_internal.h 2007-09-28 20:31:04.000000000 +0200
46 +++ CHOLMOD-uf/Include/cholmod_internal.h 2007-12-02 17:13:05.000000000 +0100
48 * It can also be redefined for other platforms, by modifying SuiteSparse_config.h.
51 -#include "SuiteSparse_config.h"
52 +#include <SuiteSparse_config.h>
54 /* -------------------------------------------------------------------------- */
55 /* Size_max: the largest value of size_t */
56 --- CHOLMOD/Lib/Makefile.orig 2013-04-15 22:11:51.000000000 +0200
57 +++ CHOLMOD/Lib/Makefile 2013-04-20 07:40:54.087771768 +0200
62 -include ../../SuiteSparse_config/SuiteSparse_config.mk
63 +include /usr/share/misc/SuiteSparse_config.mk
65 #-------------------------------------------------------------------------------
66 # the optional Partition module requires METIS, CAMD, and CCOLAMD.
67 # CAMD and CCOLAMD can be installed without METIS, but are optional.
70 -CONFIG = -DNPARTITION -DNCAMD
71 +CONFIG = -DNPARTITION
72 # check if CAMD/CCOLAMD and METIS are requested and available
73 ifeq (,$(findstring -DNCAMD, $(CHOLMOD_CONFIG)))
74 - # CAMD and CCOLAMD are requested. See if they are available
75 - ifeq (../../CAMD, $(wildcard ../../CAMD))
76 - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
77 + # CAMD and CCOLAMD are requested. Assume they are available
78 # CAMD and CCOLAMD are requested and available
79 LIB_WITH_PARTITION = \
80 - ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a
83 - -I../../CCOLAMD/Include -I../../CAMD/Include
84 + -I/usr/include/ccolamd -I/usr/include/camd
86 # check if METIS is requested and available
87 ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
88 - # METIS is requested. See if it is available
89 - ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
90 + # METIS is requested. Assume it is available
92 - LIB_WITH_PARTITION = $(METIS) \
93 - ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a
94 - I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
95 - -I../../CCOLAMD/Include -I../../CAMD/Include
96 + LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
97 + I_WITH_PARTITION = -I/usr/include/metis \
98 + -I/usr/include/ccolamd -I/usr/include/camd
106 #-------------------------------------------------------------------------------
108 -I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
109 - $(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config
110 +I = -I/usr/include/amd -I/usr/include/colamd \
111 + $(I_WITH_PARTITION) -I../Include
113 #-------------------------------------------------------------------------------
115 diff -ur CHOLMOD/Makefile CHOLMOD-uf/Makefile
116 --- CHOLMOD/Makefile 2006-11-30 17:40:08.000000000 +0100
117 +++ CHOLMOD-uf/Makefile 2007-12-02 17:12:17.000000000 +0100
122 -include ../SuiteSparse_config/SuiteSparse_config.mk
123 +include /usr/share/misc/SuiteSparse_config.mk
125 # Compile the C-callable libraries and the Demo programs.
127 diff -ur CHOLMOD/MATLAB/cholmod_matlab.h CHOLMOD-uf/MATLAB/cholmod_matlab.h
128 --- CHOLMOD/MATLAB/cholmod_matlab.h 2007-06-14 19:52:47.000000000 +0200
129 +++ CHOLMOD-uf/MATLAB/cholmod_matlab.h 2007-12-02 17:13:28.000000000 +0100
132 /* Shared prototypes and definitions for CHOLMOD mexFunctions */
134 -#include "SuiteSparse_config.h"
135 +#include <SuiteSparse_config.h>
139 diff -ur CHOLMOD/Tcov/Makefile CHOLMOD-uf/Tcov/Makefile
140 --- CHOLMOD/Tcov/Makefile 2007-05-05 19:12:46.000000000 +0200
141 +++ CHOLMOD-uf/Tcov/Makefile 2007-12-02 17:11:45.000000000 +0100
143 # If you compile CHOLMOD with -DNPARTITION, then you do not need METIS,
144 # CCOLAMD, or the Partition module.
146 -include ../../SuiteSparse_config/SuiteSparse_config.mk
147 +include /usr/share/misc/SuiteSparse_config.mk
153 I = -I../../AMD/Include -I../../COLAMD/Include \
154 -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
155 - -I../Include -I../../SuiteSparse_config
158 default: cm cl z_demo l_demo cmread clread