]>
Commit | Line | Data |
---|---|---|
1 | --- COLAMD/Include/colamd.h.orig 2012-05-29 17:03:28.000000000 +0200 | |
2 | +++ COLAMD/Include/colamd.h 2012-06-27 17:10:19.412091279 +0200 | |
3 | @@ -135,7 +135,7 @@ | |
4 | /* === Prototypes of user-callable routines ================================= */ | |
5 | /* ========================================================================== */ | |
6 | ||
7 | -#include "SuiteSparse_config.h" | |
8 | +#include <SuiteSparse_config.h> | |
9 | ||
10 | size_t colamd_recommended /* returns recommended value of Alen, */ | |
11 | /* or 0 if input arguments are erroneous */ | |
12 | --- COLAMD/Makefile~ 2007-03-27 01:18:43.219470348 +0300 | |
13 | +++ COLAMD/Makefile 2007-03-27 01:18:44.569500568 +0300 | |
14 | @@ -1,7 +1,7 @@ | |
15 | ||
16 | default: demo | |
17 | ||
18 | -include ../SuiteSparse_config/SuiteSparse_config.mk | |
19 | +include /usr/share/misc/SuiteSparse_config.mk | |
20 | ||
21 | # Compile all C code, including the C-callable routine and the mexFunctions. | |
22 | # Do not the MATLAB interface. | |
23 | --- COLAMD/Demo/Makefile 2007-05-05 15:42:44.000000000 +0200 | |
24 | +++ COLAMD.UF/Demo/Makefile 2007-12-02 15:41:19.000000000 +0100 | |
25 | @@ -4,16 +4,15 @@ | |
26 | ||
27 | default: colamd_example colamd_l_example | |
28 | ||
29 | -include ../../SuiteSparse_config/SuiteSparse_config.mk | |
30 | +include /usr/share/misc/SuiteSparse_config.mk | |
31 | ||
32 | -I = -I../Include -I../../SuiteSparse_config | |
33 | +I = -I../Include | |
34 | ||
35 | C = $(CC) $(CF) $(I) | |
36 | ||
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 | #------------------------------------------------------------------------------ | |
45 | diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile | |
46 | --- COLAMD/Lib/Makefile 2007-05-05 15:41:47.000000000 +0200 | |
47 | +++ COLAMD.UF/Lib/Makefile 2007-12-02 15:42:02.000000000 +0100 | |
48 | @@ -4,11 +4,11 @@ | |
49 | ||
50 | default: libcolamd.a | |
51 | ||
52 | -include ../../SuiteSparse_config/SuiteSparse_config.mk | |
53 | +include /usr/share/misc/SuiteSparse_config.mk | |
54 | ||
55 | -I = -I../Include -I../../SuiteSparse_config | |
56 | +I = -I../Include | |
57 | ||
58 | -INC = ../Include/colamd.h ../../SuiteSparse_config/SuiteSparse_config.h | |
59 | +INC = ../Include/colamd.h | |
60 | ||
61 | SRC = ../Source/colamd.c ../Source/colamd_global.c | |
62 |