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