projects / packages / CCOLAMD.git / blame
| Commit | Line | Data |
|---|---|---|
| 3029277c JR |
1 | --- CCOLAMD/Source/ccolamd.c~ 2006-12-13 13:46:38.000000000 +0200 |
| 2 | +++ CCOLAMD/Source/ccolamd.c 2007-03-27 01:17:49.118259378 +0300 | |
| 3 | @@ -685,7 +685,7 @@ | |
| 4 | /* ========================================================================== */ | |
| 5 | ||
| 6 | /* define UF_long */ | |
| 7 | -#include "UFconfig.h" | |
| 8 | +#include <UFconfig.h> | |
| 9 | ||
| 10 | #ifdef DLONG | |
| 11 | ||
| 12 | --- CCOLAMD/Include/ccolamd.h~ 2006-12-13 13:46:09.000000000 +0200 | |
| 13 | +++ CCOLAMD/Include/ccolamd.h 2007-03-27 01:18:06.598650636 +0300 | |
| 14 | @@ -139,7 +139,7 @@ | |
| 15 | /* ========================================================================== */ | |
| 16 | ||
| 17 | /* define UF_long */ | |
| 18 | -#include "UFconfig.h" | |
| 19 | +#include <UFconfig.h> | |
| 20 | ||
| 21 | size_t ccolamd_recommended /* returns recommended value of Alen, */ | |
| 22 | /* or 0 if input arguments are erroneous */ | |
| 23 | --- CCOLAMD/Demo/ccolamd_l_example.c~ 2006-12-13 13:47:22.000000000 +0200 | |
| 24 | +++ CCOLAMD/Demo/ccolamd_l_example.c 2007-03-27 01:18:17.698899095 +0300 | |
| 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 | --- CCOLAMD/Makefile~ 2007-03-27 01:18:43.219470348 +0300 | |
| 35 | +++ CCOLAMD/Makefile 2007-03-27 01:18:44.569500568 +0300 | |
| 36 | @@ -1,7 +1,7 @@ | |
| 37 | ||
| 38 | default: demo | |
| 39 | ||
| 40 | -include ../UFconfig/UFconfig.mk | |
| 41 | +include /usr/share/misc/UFconfig.mk | |
| 42 | ||
| 43 | # Compile all C code, including the C-callable routine and the mexFunctions. | |
| 44 | # Do not the MATLAB interface. | |
| 45 | diff -ur CCOLAMD/Demo/Makefile CCOLAMD.UF/Demo/Makefile | |
| 46 | --- CCOLAMD/Demo/Makefile 2007-05-05 15:42:44.000000000 +0200 | |
| 47 | +++ CCOLAMD.UF/Demo/Makefile 2007-12-02 15:41:19.000000000 +0100 | |
| 48 | @@ -4,9 +4,9 @@ | |
| 49 | ||
| 50 | default: ccolamd_example ccolamd_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 CCOLAMD/Lib/Makefile CCOLAMD.UF/Lib/Makefile | |
| 61 | --- CCOLAMD/Lib/Makefile 2007-05-05 15:41:47.000000000 +0200 | |
| 62 | +++ CCOLAMD.UF/Lib/Makefile 2007-12-02 15:42:02.000000000 +0100 | |
| 63 | @@ -4,11 +4,11 @@ | |
| 64 | ||
| 65 | default: libccolamd.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/ccolamd.h ../../UFconfig/UFconfig.h | |
| 74 | +INC = ../Include/ccolamd.h | |
| 75 | ||
| 76 | SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c | |
| 77 | ||
| 78 | diff -ur CCOLAMD/MATLAB/Makefile CCOLAMD.UF/MATLAB/Makefile | |
| 79 | --- CCOLAMD/MATLAB/Makefile 2007-05-06 04:41:53.000000000 +0200 | |
| 80 | +++ CCOLAMD.UF/MATLAB/Makefile 2007-12-02 15:42:15.000000000 +0100 | |
| 81 | @@ -2,11 +2,11 @@ | |
| 82 | ||
| 83 | default: ccolamd2 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/ccolamd.h ../../UFconfig/UFconfig.h | |
| 92 | +INC = ../Include/ccolamd.h | |
| 93 | ||
| 94 | SRC = ../Source/ccolamd.c ../Source/ccolamd_global.c | |
| 95 |