]> git.pld-linux.org Git - packages/CAMD.git/blame - CAMD-ufconfig.patch
- fix SuiteSparse_config BR
[packages/CAMD.git] / CAMD-ufconfig.patch
CommitLineData
03242481
JB
1--- CAMD/Demo/Makefile.orig 2012-05-27 01:23:01.000000000 +0200
2+++ CAMD/Demo/Makefile 2012-06-27 16:48:20.148813310 +0200
442aee65 3@@ -4,16 +4,15 @@
cce10295
JR
4
5 default: camd_simple camd_demo camd_demo2 camd_l_demo
6
03242481
JB
7-include ../../SuiteSparse_config/SuiteSparse_config.mk
8+include /usr/share/misc/SuiteSparse_config.mk
cce10295 9
03242481 10-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
eb8671f8 11+C = $(CC) $(CF) -I../Include
cce10295 12
03242481 13-INC = ../Include/camd.h ../../SuiteSparse_config/SuiteSparse_config.h
cce10295
JR
14+INC = ../Include/camd.h
15
442aee65
JB
16-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
17+LIB2 = -lsuitesparseconfig $(LIB)
18
cce10295 19 library:
442aee65 20- ( cd ../../SuiteSparse_config ; $(MAKE) )
cce10295 21 ( cd ../Lib ; $(MAKE) )
442aee65
JB
22
23 #------------------------------------------------------------------------------
cce10295
JR
24diff -ur CAMD/Doc/Makefile CAMD-uf/Doc/Makefile
25--- CAMD/Doc/Makefile 2006-04-25 18:34:27.000000000 +0200
26+++ CAMD-uf/Doc/Makefile 2007-12-02 18:01:59.000000000 +0100
27@@ -4,7 +4,7 @@
28
29 default: dist
30
03242481
JB
31-include ../../SuiteSparse_config/SuiteSparse_config.mk
32+include /usr/share/misc/SuiteSparse_config.mk
cce10295
JR
33
34 #------------------------------------------------------------------------------
35 # Remove all but the files in the original distribution
03242481
JB
36--- CAMD/Include/camd.h.orig 2012-05-29 18:43:27.000000000 +0200
37+++ CAMD/Include/camd.h 2012-06-27 16:22:56.608877247 +0200
38@@ -31,7 +31,7 @@
39 /* get the definition of size_t: */
cce10295
JR
40 #include <stddef.h>
41
03242481
JB
42-#include "SuiteSparse_config.h"
43+#include <SuiteSparse_config.h>
cce10295 44
03242481
JB
45 int camd_order /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
46 * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
eb8671f8
JB
47--- CAMD/Lib/Makefile.orig 2011-12-08 18:36:42.000000000 +0100
48+++ CAMD/Lib/Makefile 2012-01-01 13:52:49.706230628 +0100
cce10295
JR
49@@ -8,9 +8,9 @@
50
51 default: everything
52
03242481
JB
53-include ../../SuiteSparse_config/SuiteSparse_config.mk
54+include /usr/share/misc/SuiteSparse_config.mk
cce10295 55
03242481 56-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
eb8671f8 57+C = $(CC) $(CF) -I../Include
cce10295
JR
58
59 everything:
60 $(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o
61diff -ur CAMD/Makefile CAMD-uf/Makefile
62--- CAMD/Makefile 2007-05-05 19:23:47.000000000 +0200
63+++ CAMD-uf/Makefile 2007-12-02 18:02:33.000000000 +0100
64@@ -4,7 +4,7 @@
65
66 default: demo
67
03242481
JB
68-include ../SuiteSparse_config/SuiteSparse_config.mk
69+include /usr/share/misc/SuiteSparse_config.mk
cce10295
JR
70
71 # Compile all C code, including the C-callable routines.
72 # Do not compile the FORTRAN versions, or MATLAB interface.
03242481
JB
73--- CAMD/Lib/GNUmakefile.orig 2012-05-27 01:26:47.000000000 +0200
74+++ CAMD/Lib/GNUmakefile 2012-06-27 16:48:35.802145990 +0200
cce10295
JR
75@@ -4,9 +4,9 @@
76
eb8671f8 77 default: libcamd.a
cce10295 78
03242481
JB
79-include ../../SuiteSparse_config/SuiteSparse_config.mk
80+include /usr/share/misc/SuiteSparse_config.mk
cce10295 81
03242481 82-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
eb8671f8 83+C = $(CC) $(CF) -I../Include
cce10295
JR
84
85 #-------------------------------------------------------------------------------
86 # source files
03242481 87@@ -15,8 +15,7 @@
eb8671f8 88 CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \
cce10295
JR
89 camd_order camd_control camd_info camd_valid camd_preprocess
90
03242481
JB
91-INC = ../Include/camd.h ../Include/camd_internal.h \
92- ../../SuiteSparse_config/SuiteSparse_config.h
cce10295
JR
93+INC = ../Include/camd.h ../Include/camd_internal.h
94
95 #-------------------------------------------------------------------------------
96 # object files for each version
This page took 0.07627 seconds and 4 git commands to generate.