projects / packages / COLAMD.git / blame
| Commit | Line | Data |
|---|---|---|
| e0318b64 JB |
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 ================================= */ | |
| 3ed1b792 ER |
5 | /* ========================================================================== */ |
| 6 | ||
| e0318b64 JB |
7 | -#include "SuiteSparse_config.h" |
| 8 | +#include <SuiteSparse_config.h> | |
| 3ed1b792 ER |
9 | |
| 10 | size_t colamd_recommended /* returns recommended value of Alen, */ | |
| 11 | /* or 0 if input arguments are erroneous */ | |
| 3ed1b792 ER |
12 | --- COLAMD/Makefile~ 2007-03-27 01:18:43.219470348 +0300 |
| 13 | +++ COLAMD/Makefile 2007-03-27 01:18:44.569500568 +0300 | |
| 606d9b06 | 14 | @@ -1,7 +1,7 @@ |
| 3ed1b792 | 15 | |
| 606d9b06 | 16 | default: demo |
| 3ed1b792 | 17 | |
| e0318b64 JB |
18 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
| 19 | +include /usr/share/misc/SuiteSparse_config.mk | |
| 3ed1b792 | 20 | |
| 606d9b06 JR |
21 | # Compile all C code, including the C-callable routine and the mexFunctions. |
| 22 | # Do not the MATLAB interface. | |
| 6980c241 JR |
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 | |
| 23d2a546 | 25 | @@ -4,16 +4,15 @@ |
| 6980c241 JR |
26 | |
| 27 | default: colamd_example colamd_l_example | |
| 28 | ||
| e0318b64 JB |
29 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
| 30 | +include /usr/share/misc/SuiteSparse_config.mk | |
| 6980c241 | 31 | |
| e0318b64 | 32 | -I = -I../Include -I../../SuiteSparse_config |
| 6980c241 JR |
33 | +I = -I../Include |
| 34 | ||
| 23d2a546 | 35 | C = $(CC) $(CF) $(I) |
| 6980c241 | 36 | |
| 23d2a546 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 | #------------------------------------------------------------------------------ | |
| 6980c241 JR |
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 | ||
| e0318b64 JB |
52 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
| 53 | +include /usr/share/misc/SuiteSparse_config.mk | |
| 6980c241 | 54 | |
| e0318b64 | 55 | -I = -I../Include -I../../SuiteSparse_config |
| 6980c241 JR |
56 | +I = -I../Include |
| 57 | ||
| e0318b64 | 58 | -INC = ../Include/colamd.h ../../SuiteSparse_config/SuiteSparse_config.h |
| 6980c241 JR |
59 | +INC = ../Include/colamd.h |
| 60 | ||
| 61 | SRC = ../Source/colamd.c ../Source/colamd_global.c | |
| 62 |