]>
Commit | Line | Data |
---|---|---|
e03eab06 JR |
1 | --- COLAMD/Source/colamd.c~ 2006-12-13 13:46:38.000000000 +0200 |
2 | +++ COLAMD/Source/colamd.c 2007-03-27 01:17:49.118259378 +0300 | |
3ed1b792 ER |
3 | @@ -685,7 +685,7 @@ |
4 | /* ========================================================================== */ | |
5 | ||
6 | /* define UF_long */ | |
7 | -#include "UFconfig.h" | |
8 | +#include <UFconfig.h> | |
9 | ||
10 | #ifdef DLONG | |
11 | ||
606d9b06 JR |
12 | --- COLAMD/Include/colamd.h~ 2006-12-13 13:46:09.000000000 +0200 |
13 | +++ COLAMD/Include/colamd.h 2007-03-27 01:18:06.598650636 +0300 | |
3ed1b792 ER |
14 | @@ -139,7 +139,7 @@ |
15 | /* ========================================================================== */ | |
16 | ||
17 | /* define UF_long */ | |
18 | -#include "UFconfig.h" | |
19 | +#include <UFconfig.h> | |
20 | ||
21 | size_t colamd_recommended /* returns recommended value of Alen, */ | |
22 | /* or 0 if input arguments are erroneous */ | |
606d9b06 JR |
23 | --- COLAMD/Demo/colamd_l_example.c~ 2006-12-13 13:47:22.000000000 +0200 |
24 | +++ COLAMD/Demo/colamd_l_example.c 2007-03-27 01:18:17.698899095 +0300 | |
3ed1b792 ER |
25 | @@ -44,7 +44,7 @@ |
26 | #define B_N 5 | |
27 | ||
28 | /* define UF_long */ | |
29 | -#include "UFconfig.h" | |
30 | +#include <UFconfig.h> | |
31 | ||
32 | int main (void) | |
33 | { | |
34 | --- COLAMD/Makefile~ 2007-03-27 01:18:43.219470348 +0300 | |
35 | +++ COLAMD/Makefile 2007-03-27 01:18:44.569500568 +0300 | |
606d9b06 | 36 | @@ -1,7 +1,7 @@ |
3ed1b792 | 37 | |
606d9b06 | 38 | default: demo |
3ed1b792 ER |
39 | |
40 | -include ../UFconfig/UFconfig.mk | |
3ed1b792 ER |
41 | +include /usr/share/misc/UFconfig.mk |
42 | ||
606d9b06 JR |
43 | # Compile all C code, including the C-callable routine and the mexFunctions. |
44 | # Do not the MATLAB interface. | |
6980c241 JR |
45 | diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile |
46 | --- COLAMD/Demo/Makefile 2007-05-05 15:42:44.000000000 +0200 | |
47 | +++ COLAMD.UF/Demo/Makefile 2007-12-02 15:41:19.000000000 +0100 | |
48 | @@ -4,9 +4,9 @@ | |
49 | ||
50 | default: colamd_example colamd_l_example | |
51 | ||
52 | -include ../../UFconfig/UFconfig.mk | |
53 | +include /usr/share/misc/UFconfig.mk | |
54 | ||
55 | -I = -I../Include -I../../UFconfig | |
56 | +I = -I../Include | |
57 | ||
58 | C = $(CC) $(CFLAGS) $(I) | |
59 | ||
60 | diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile | |
61 | --- COLAMD/Lib/Makefile 2007-05-05 15:41:47.000000000 +0200 | |
62 | +++ COLAMD.UF/Lib/Makefile 2007-12-02 15:42:02.000000000 +0100 | |
63 | @@ -4,11 +4,11 @@ | |
64 | ||
65 | default: libcolamd.a | |
66 | ||
67 | -include ../../UFconfig/UFconfig.mk | |
68 | +include /usr/share/misc/UFconfig.mk | |
69 | ||
70 | -I = -I../Include -I../../UFconfig | |
71 | +I = -I../Include | |
72 | ||
73 | -INC = ../Include/colamd.h ../../UFconfig/UFconfig.h | |
74 | +INC = ../Include/colamd.h | |
75 | ||
76 | SRC = ../Source/colamd.c ../Source/colamd_global.c | |
77 | ||
78 | diff -ur COLAMD/MATLAB/Makefile COLAMD.UF/MATLAB/Makefile | |
79 | --- COLAMD/MATLAB/Makefile 2007-05-06 04:41:53.000000000 +0200 | |
80 | +++ COLAMD.UF/MATLAB/Makefile 2007-12-02 15:42:15.000000000 +0100 | |
81 | @@ -2,11 +2,11 @@ | |
82 | ||
83 | default: colamd2 symamd2 | |
84 | ||
85 | -include ../../UFconfig/UFconfig.mk | |
86 | +include /usr/share/misc/UFconfig.mk | |
87 | ||
88 | -I = -I../../UFconfig -I../Include | |
89 | +I = -I../Include | |
90 | ||
91 | -INC = ../Include/colamd.h ../../UFconfig/UFconfig.h | |
92 | +INC = ../Include/colamd.h | |
93 | ||
94 | SRC = ../Source/colamd.c ../Source/colamd_global.c | |
95 |