]>
Commit | Line | Data |
---|---|---|
928ad810 JB |
1 | --- CCOLAMD/Include/ccolamd.h.orig 2012-05-29 16:54:52.000000000 +0200 |
2 | +++ CCOLAMD/Include/ccolamd.h 2012-06-27 17:14:53.668746441 +0200 | |
3 | @@ -112,7 +112,7 @@ | |
4 | /* === Prototypes of user-callable routines ================================= */ | |
3029277c JR |
5 | /* ========================================================================== */ |
6 | ||
928ad810 JB |
7 | -#include "SuiteSparse_config.h" |
8 | +#include <SuiteSparse_config.h> | |
3029277c JR |
9 | |
10 | size_t ccolamd_recommended /* returns recommended value of Alen, */ | |
11 | /* or 0 if input arguments are erroneous */ | |
3029277c JR |
12 | --- CCOLAMD/Makefile~ 2007-03-27 01:18:43.219470348 +0300 |
13 | +++ CCOLAMD/Makefile 2007-03-27 01:18:44.569500568 +0300 | |
14 | @@ -1,7 +1,7 @@ | |
15 | ||
16 | default: demo | |
17 | ||
928ad810 JB |
18 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
19 | +include /usr/share/misc/SuiteSparse_config.mk | |
3029277c JR |
20 | |
21 | # Compile all C code, including the C-callable routine and the mexFunctions. | |
22 | # Do not the MATLAB interface. | |
3029277c JR |
23 | --- CCOLAMD/Demo/Makefile 2007-05-05 15:42:44.000000000 +0200 |
24 | +++ CCOLAMD.UF/Demo/Makefile 2007-12-02 15:41:19.000000000 +0100 | |
979439cc | 25 | @@ -4,16 +4,15 @@ |
3029277c JR |
26 | |
27 | default: ccolamd_example ccolamd_l_example | |
28 | ||
928ad810 JB |
29 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
30 | +include /usr/share/misc/SuiteSparse_config.mk | |
3029277c | 31 | |
928ad810 | 32 | -I = -I../Include -I../../SuiteSparse_config |
3029277c JR |
33 | +I = -I../Include |
34 | ||
979439cc | 35 | C = $(CC) $(CF) $(I) |
3029277c | 36 | |
979439cc JB |
37 | -LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB) |
38 | +LIB2 = -lsuitesparseconfig $(LIB) | |
39 | ||
40 | library: | |
41 | - ( cd ../../SuiteSparse_config ; $(MAKE) ) | |
42 | ( cd ../Lib ; $(MAKE) ) | |
43 | ||
44 | #------------------------------------------------------------------------------ | |
3029277c JR |
45 | --- CCOLAMD/Lib/Makefile 2007-05-05 15:41:47.000000000 +0200 |
46 | +++ CCOLAMD.UF/Lib/Makefile 2007-12-02 15:42:02.000000000 +0100 | |
47 | @@ -4,11 +4,11 @@ | |
48 | ||
49 | default: libccolamd.a | |
50 | ||
928ad810 JB |
51 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
52 | +include /usr/share/misc/SuiteSparse_config.mk | |
3029277c | 53 | |
928ad810 | 54 | -I = -I../Include -I../../SuiteSparse_config |
3029277c JR |
55 | +I = -I../Include |
56 | ||
928ad810 | 57 | -INC = ../Include/ccolamd.h ../../SuiteSparse_config/SuiteSparse_config.h |
3029277c JR |
58 | +INC = ../Include/ccolamd.h |
59 | ||
60 | SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c | |
61 |