]>
Commit | Line | Data |
---|---|---|
cce10295 JR |
1 | diff -ur CAMD/Demo/camd_l_demo.c CAMD-uf/Demo/camd_l_demo.c |
2 | --- CAMD/Demo/camd_l_demo.c 2007-05-03 17:16:55.000000000 +0200 | |
3 | +++ CAMD-uf/Demo/camd_l_demo.c 2007-12-02 18:02:54.000000000 +0100 | |
4 | @@ -16,7 +16,7 @@ | |
5 | #include <stdlib.h> | |
6 | ||
7 | /* define UF_long */ | |
8 | -#include "UFconfig.h" | |
9 | +#include <UFconfig.h> | |
10 | ||
11 | int main (void) | |
12 | { | |
eb8671f8 JB |
13 | --- CAMD/Demo/Makefile.orig 2011-12-08 17:12:27.000000000 +0100 |
14 | +++ CAMD/Demo/Makefile 2012-01-01 13:52:29.406229949 +0100 | |
cce10295 JR |
15 | @@ -4,13 +4,13 @@ |
16 | ||
17 | default: camd_simple camd_demo camd_demo2 camd_l_demo | |
18 | ||
19 | -include ../../UFconfig/UFconfig.mk | |
20 | +include /usr/share/misc/UFconfig.mk | |
21 | ||
eb8671f8 JB |
22 | -C = $(CC) $(CF) -I../Include -I../../UFconfig |
23 | +C = $(CC) $(CF) -I../Include | |
cce10295 JR |
24 | |
25 | -UFCONFIG = ../../UFconfig/UFconfig.h | |
26 | +UFCONFIG = /usr/share/misc/UFconfig.mk | |
eb8671f8 | 27 | |
cce10295 JR |
28 | -INC = ../Include/camd.h $(UFCONFIG) |
29 | +INC = ../Include/camd.h | |
30 | ||
31 | library: | |
32 | ( cd ../Lib ; $(MAKE) ) | |
33 | diff -ur CAMD/Doc/Makefile CAMD-uf/Doc/Makefile | |
34 | --- CAMD/Doc/Makefile 2006-04-25 18:34:27.000000000 +0200 | |
35 | +++ CAMD-uf/Doc/Makefile 2007-12-02 18:01:59.000000000 +0100 | |
36 | @@ -4,7 +4,7 @@ | |
37 | ||
38 | default: dist | |
39 | ||
40 | -include ../../UFconfig/UFconfig.mk | |
41 | +include /usr/share/misc/UFconfig.mk | |
42 | ||
43 | #------------------------------------------------------------------------------ | |
44 | # Remove all but the files in the original distribution | |
45 | diff -ur CAMD/Include/camd.h CAMD-uf/Include/camd.h | |
46 | --- CAMD/Include/camd.h 2007-05-04 17:11:54.000000000 +0200 | |
47 | +++ CAMD-uf/Include/camd.h 2007-12-02 18:03:19.000000000 +0100 | |
48 | @@ -45,7 +45,7 @@ | |
49 | #include <stddef.h> | |
50 | ||
51 | /* define UF_long */ | |
52 | -#include "UFconfig.h" | |
53 | +#include <UFconfig.h> | |
54 | ||
55 | int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED, | |
56 | * AMD_INVALID, or AMD_OUT_OF_MEMORY */ | |
57 | diff -ur CAMD/Include/camd_internal.h CAMD-uf/Include/camd_internal.h | |
58 | --- CAMD/Include/camd_internal.h 2007-05-03 17:26:14.000000000 +0200 | |
59 | +++ CAMD-uf/Include/camd_internal.h 2007-12-02 18:03:11.000000000 +0100 | |
60 | @@ -162,7 +162,7 @@ | |
61 | /* ------------------------------------------------------------------------- */ | |
62 | ||
63 | /* define UF_long */ | |
64 | -#include "UFconfig.h" | |
65 | +#include <UFconfig.h> | |
66 | ||
67 | #if defined (DLONG) || defined (ZLONG) | |
68 | ||
eb8671f8 JB |
69 | --- CAMD/Lib/Makefile.orig 2011-12-08 18:36:42.000000000 +0100 |
70 | +++ CAMD/Lib/Makefile 2012-01-01 13:52:49.706230628 +0100 | |
cce10295 JR |
71 | @@ -8,9 +8,9 @@ |
72 | ||
73 | default: everything | |
74 | ||
75 | -include ../../UFconfig/UFconfig.mk | |
76 | +include /usr/share/misc/UFconfig.mk | |
77 | ||
eb8671f8 JB |
78 | -C = $(CC) $(CF) -I../Include -I../../UFconfig |
79 | +C = $(CC) $(CF) -I../Include | |
cce10295 JR |
80 | |
81 | everything: | |
82 | $(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o | |
83 | diff -ur CAMD/Makefile CAMD-uf/Makefile | |
84 | --- CAMD/Makefile 2007-05-05 19:23:47.000000000 +0200 | |
85 | +++ CAMD-uf/Makefile 2007-12-02 18:02:33.000000000 +0100 | |
86 | @@ -4,7 +4,7 @@ | |
87 | ||
88 | default: demo | |
89 | ||
90 | -include ../UFconfig/UFconfig.mk | |
91 | +include /usr/share/misc/UFconfig.mk | |
92 | ||
93 | # Compile all C code, including the C-callable routines. | |
94 | # Do not compile the FORTRAN versions, or MATLAB interface. | |
95 | diff -ur CAMD/MATLAB/camd_mex.c CAMD-uf/MATLAB/camd_mex.c | |
96 | --- CAMD/MATLAB/camd_mex.c 2007-05-03 17:22:16.000000000 +0200 | |
97 | +++ CAMD-uf/MATLAB/camd_mex.c 2007-12-02 18:03:32.000000000 +0100 | |
98 | @@ -30,7 +30,7 @@ | |
99 | #include "camd.h" | |
100 | #include "mex.h" | |
101 | #include "matrix.h" | |
102 | -#include "UFconfig.h" | |
103 | +#include <UFconfig.h> | |
104 | ||
105 | void mexFunction | |
106 | ( | |
107 | diff -ur CAMD/MATLAB/Makefile CAMD-uf/MATLAB/Makefile | |
108 | --- CAMD/MATLAB/Makefile 2007-05-03 16:02:45.000000000 +0200 | |
109 | +++ CAMD-uf/MATLAB/Makefile 2007-12-02 18:02:24.000000000 +0100 | |
110 | @@ -4,13 +4,13 @@ | |
111 | ||
112 | default: amd2 | |
113 | ||
114 | -include ../../UFconfig/UFconfig.mk | |
115 | +include /usr/share/misc/UFconfig.mk | |
116 | ||
117 | CAMD = ../Lib/libcamd.a | |
118 | ||
119 | -I = -I../Include -I../../UFconfig | |
120 | +I = -I../Include | |
121 | ||
122 | -INC = ../Include/camd.h ../Include/camd_internal.h ../../UFconfig/UFconfig.h | |
123 | +INC = ../Include/camd.h ../Include/camd_internal.h | |
124 | ||
125 | SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \ | |
126 | ../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \ | |
eb8671f8 JB |
127 | --- CAMD/Lib/GNUmakefile.orig 2011-12-08 18:36:27.000000000 +0100 |
128 | +++ CAMD/Lib/GNUmakefile 2012-01-01 13:53:05.949564506 +0100 | |
cce10295 JR |
129 | @@ -4,9 +4,9 @@ |
130 | ||
eb8671f8 | 131 | default: libcamd.a |
cce10295 JR |
132 | |
133 | -include ../../UFconfig/UFconfig.mk | |
134 | +include /usr/share/misc/UFconfig.mk | |
135 | ||
eb8671f8 JB |
136 | -C = $(CC) $(CF) -I../Include -I../../UFconfig |
137 | +C = $(CC) $(CF) -I../Include | |
cce10295 JR |
138 | |
139 | #------------------------------------------------------------------------------- | |
140 | # source files | |
eb8671f8 JB |
141 | @@ -15,9 +15,7 @@ C = $(CC) $(CF) -I../Include -I../../UFc |
142 | CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \ | |
cce10295 JR |
143 | camd_order camd_control camd_info camd_valid camd_preprocess |
144 | ||
145 | -UFCONFIG = ../../UFconfig/UFconfig.h | |
146 | - | |
147 | -INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG) | |
148 | +INC = ../Include/camd.h ../Include/camd_internal.h | |
149 | ||
150 | #------------------------------------------------------------------------------- | |
151 | # object files for each version |