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