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