]>
Commit | Line | Data |
---|---|---|
3c1057dd JR |
1 | diff -ur UMFPACK/Demo/Makefile UMFPACK.shared/Demo/Makefile |
2 | --- UMFPACK/Demo/Makefile 2007-12-07 01:52:29.000000000 +0100 | |
3 | +++ UMFPACK.shared/Demo/Makefile 2007-12-07 01:58:48.000000000 +0100 | |
4 | @@ -9,23 +9,19 @@ | |
5 | ||
6 | include /usr/share/misc/UFconfig.mk | |
7 | ||
8 | -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include | |
ce9770d5 | 9 | +C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd |
3c1057dd JR |
10 | |
11 | -INC = ../Include/umfpack.h ../../AMD/Include/amd.h | |
12 | +INC = ../Include/umfpack.h | |
13 | ||
14 | -LIBS = $(BLAS) $(XERBLA) $(LIB) | |
15 | +LIBS = $(BLAS) $(XERBLA) $(LIB) -lamd | |
16 | ||
17 | -../Lib/libumfpack.a: | |
18 | +../Lib/libumfpack.la: | |
19 | ( cd ../Lib ; $(MAKE) ) | |
20 | ||
21 | -../../AMD/Lib/libamd.a: | |
22 | - ( cd ../../AMD ; $(MAKE) library ) | |
23 | - | |
24 | -UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a | |
25 | +UMFPACK = ../Lib/libumfpack.la | |
26 | ||
27 | libs: | |
28 | ( cd ../Lib ; $(MAKE) ) | |
29 | - ( cd ../../AMD ; $(MAKE) library ) | |
30 | ||
31 | #------------------------------------------------------------------------------- | |
32 | # Create the demo programs, run them, and compare the output | |
33 | @@ -34,7 +30,7 @@ | |
34 | dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c | |
35 | ||
36 | umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK) | |
37 | - $(C) -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS) | |
ce9770d5 | 38 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS) |
3c1057dd JR |
39 | |
40 | # the GNU rules are simpler: | |
41 | # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed | |
42 | @@ -51,28 +47,28 @@ | |
43 | - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c | |
44 | ||
45 | umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK) | |
46 | - $(C) -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS) | |
ce9770d5 | 47 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS) |
3c1057dd JR |
48 | |
49 | # double-precision, UF_long verion: | |
50 | umfpack_dl_demo.c: umfpack_xx_demo.c umfpack_dl_demo.sed | |
51 | - sed -f umfpack_dl_demo.sed < umfpack_xx_demo.c > umfpack_dl_demo.c | |
52 | ||
53 | umfpack_dl_demo: umfpack_dl_demo.c $(INC) $(UMFPACK) | |
54 | - $(C) -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS) | |
ce9770d5 | 55 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS) |
3c1057dd JR |
56 | |
57 | # complex, int verion: | |
58 | umfpack_zi_demo.c: umfpack_xx_demo.c umfpack_zi_demo.sed | |
59 | - sed -f umfpack_zi_demo.sed < umfpack_xx_demo.c > umfpack_zi_demo.c | |
60 | ||
61 | umfpack_zi_demo: umfpack_zi_demo.c $(INC) $(UMFPACK) | |
62 | - $(C) -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS) | |
ce9770d5 | 63 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS) |
3c1057dd JR |
64 | |
65 | # complex, UF_long verion: | |
66 | umfpack_zl_demo.c: umfpack_xx_demo.c umfpack_zl_demo.sed | |
67 | - sed -f umfpack_zl_demo.sed < umfpack_xx_demo.c > umfpack_zl_demo.c | |
68 | ||
69 | umfpack_zl_demo: umfpack_zl_demo.c $(INC) $(UMFPACK) | |
70 | - $(C) -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS) | |
ce9770d5 | 71 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS) |
3c1057dd JR |
72 | |
73 | run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple | |
74 | ./umfpack_simple | |
75 | diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile | |
76 | --- UMFPACK/Lib/GNUmakefile 2007-12-07 01:52:29.000000000 +0100 | |
77 | +++ UMFPACK.shared/Lib/GNUmakefile 2007-12-07 02:08:48.000000000 +0100 | |
78 | @@ -2,12 +2,11 @@ | |
79 | # UMFPACK Makefile for compiling on Unix systems (for GNU Make) | |
80 | #------------------------------------------------------------------------------- | |
81 | ||
82 | -default: ../Lib/libumfpack.a | |
83 | +default: ../Lib/libumfpack.la | |
84 | ||
85 | include /usr/share/misc/UFconfig.mk | |
86 | ||
87 | -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \ | |
88 | - -I../Include -I../Source -I../../AMD/Include | |
ce9770d5 | 89 | +C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd |
3c1057dd JR |
90 | |
91 | #------------------------------------------------------------------------------- | |
92 | # source files | |
93 | @@ -71,8 +70,7 @@ | |
94 | $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \ | |
95 | $(addprefix ../Source/, $(addsuffix .h,$(UMFINT))) \ | |
96 | $(addprefix ../Include/, $(addsuffix .h,$(USER))) \ | |
97 | - $(addprefix ../Include/, $(addsuffix .h,$(GENERIC))) \ | |
98 | - ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h | |
99 | + $(addprefix ../Include/, $(addsuffix .h,$(GENERIC))) | |
100 | ||
101 | #------------------------------------------------------------------------------- | |
102 | # object files for each version | |
103 | @@ -91,146 +89,146 @@ | |
104 | #------------------------------------------------------------------------------- | |
105 | ||
106 | umf_i_%.o: ../Source/umf_%.c $(INC) | |
107 | - $(C) -DDINT -c $< -o $@ | |
ce9770d5 | 108 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
109 | |
110 | umf_l_%.o: ../Source/umf_%.c $(INC) | |
111 | - $(C) -DDLONG -c $< -o $@ | |
ce9770d5 | 112 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
113 | |
114 | #------------------------------------------------------------------------------- | |
115 | # compile each routine in the DI version | |
116 | #------------------------------------------------------------------------------- | |
117 | ||
118 | umf_di_%.o: ../Source/umf_%.c $(INC) | |
119 | - $(C) -DDINT -c $< -o $@ | |
ce9770d5 | 120 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
121 | |
122 | umf_di_%hsolve.o: ../Source/umf_%tsolve.c $(INC) | |
123 | - $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ | |
ce9770d5 | 124 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
125 | |
126 | umf_di_triplet_map_x.o: ../Source/umf_triplet.c $(INC) | |
127 | - $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 128 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
129 | |
130 | umf_di_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) | |
131 | - $(C) -DDINT -DDO_MAP -c $< -o $@ | |
ce9770d5 | 132 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
133 | |
134 | umf_di_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) | |
135 | - $(C) -DDINT -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 136 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
137 | |
138 | umf_di_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) | |
139 | - $(C) -DDINT -c $< -o $@ | |
ce9770d5 | 140 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
141 | |
142 | umf_di_assemble_fixq.o: ../Source/umf_assemble.c $(INC) | |
143 | - $(C) -DDINT -DFIXQ -c $< -o $@ | |
ce9770d5 | 144 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
145 | |
146 | umf_di_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) | |
147 | - $(C) -DDINT -DDROP -c $< -o $@ | |
ce9770d5 | 148 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
149 | |
150 | umfpack_di_wsolve.o: ../Source/umfpack_solve.c $(INC) | |
151 | - $(C) -DDINT -DWSOLVE -c $< -o $@ | |
ce9770d5 | 152 | + libtool --tag=CC --mode=compile $(CC) -DDINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
153 | |
154 | umfpack_di_%.o: ../Source/umfpack_%.c $(INC) | |
155 | - $(C) -DDINT -c $< -o $@ | |
ce9770d5 | 156 | + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
157 | |
158 | #------------------------------------------------------------------------------- | |
159 | # compile each routine in the DL version | |
160 | #------------------------------------------------------------------------------- | |
161 | ||
162 | umf_dl_%.o: ../Source/umf_%.c $(INC) | |
163 | - $(C) -DDLONG -c $< -o $@ | |
ce9770d5 | 164 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
165 | |
166 | umf_dl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) | |
167 | - $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ | |
ce9770d5 | 168 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
169 | |
170 | umf_dl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) | |
171 | - $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 172 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
173 | |
174 | umf_dl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) | |
175 | - $(C) -DDLONG -DDO_MAP -c $< -o $@ | |
ce9770d5 | 176 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
177 | |
178 | umf_dl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) | |
179 | - $(C) -DDLONG -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 180 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
181 | |
182 | umf_dl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) | |
183 | - $(C) -DDLONG -c $< -o $@ | |
ce9770d5 | 184 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
185 | |
186 | umf_dl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) | |
187 | - $(C) -DDLONG -DFIXQ -c $< -o $@ | |
ce9770d5 | 188 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
189 | |
190 | umf_dl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) | |
191 | - $(C) -DDLONG -DDROP -c $< -o $@ | |
ce9770d5 | 192 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
193 | |
194 | umfpack_dl_wsolve.o: ../Source/umfpack_solve.c $(INC) | |
195 | - $(C) -DDLONG -DWSOLVE -c $< -o $@ | |
ce9770d5 | 196 | + libtool --tag=CC --mode=compile $(CC) -DDLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
197 | |
198 | umfpack_dl_%.o: ../Source/umfpack_%.c $(INC) | |
199 | - $(C) -DDLONG -c $< -o $@ | |
ce9770d5 | 200 | + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
201 | |
202 | #------------------------------------------------------------------------------- | |
203 | # compile each routine in the ZI version | |
204 | #------------------------------------------------------------------------------- | |
205 | ||
206 | umf_zi_%.o: ../Source/umf_%.c $(INC) | |
207 | - $(C) -DZINT -c $< -o $@ | |
ce9770d5 | 208 | + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
209 | |
210 | umf_zi_%hsolve.o: ../Source/umf_%tsolve.c $(INC) | |
211 | - $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ | |
ce9770d5 | 212 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
213 | |
214 | umf_zi_triplet_map_x.o: ../Source/umf_triplet.c $(INC) | |
215 | - $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 216 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
217 | |
218 | umf_zi_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) | |
219 | - $(C) -DZINT -DDO_MAP -c $< -o $@ | |
ce9770d5 | 220 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
221 | |
222 | umf_zi_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) | |
223 | - $(C) -DZINT -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 224 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
225 | |
226 | umf_zi_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) | |
227 | - $(C) -DZINT -c $< -o $@ | |
ce9770d5 | 228 | + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
229 | |
230 | umf_zi_assemble_fixq.o: ../Source/umf_assemble.c $(INC) | |
231 | - $(C) -DZINT -DFIXQ -c $< -o $@ | |
ce9770d5 | 232 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
233 | |
234 | umf_zi_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) | |
235 | - $(C) -DZINT -DDROP -c $< -o $@ | |
ce9770d5 | 236 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
237 | |
238 | umfpack_zi_wsolve.o: ../Source/umfpack_solve.c $(INC) | |
239 | - $(C) -DZINT -DWSOLVE -c $< -o $@ | |
ce9770d5 | 240 | + libtool --tag=CC --mode=compile $(CC) -DZINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
241 | |
242 | umfpack_zi_%.o: ../Source/umfpack_%.c $(INC) | |
243 | - $(C) -DZINT -c $< -o $@ | |
ce9770d5 | 244 | + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
245 | |
246 | #------------------------------------------------------------------------------- | |
247 | # compile each routine in the ZL version | |
248 | #------------------------------------------------------------------------------- | |
249 | ||
250 | umf_zl_%.o: ../Source/umf_%.c $(INC) | |
251 | - $(C) -DZLONG -c $< -o $@ | |
ce9770d5 | 252 | + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
253 | |
254 | umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) | |
255 | - $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@ | |
ce9770d5 | 256 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
257 | |
258 | umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) | |
259 | - $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 260 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
261 | |
262 | umf_zl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) | |
263 | - $(C) -DZLONG -DDO_MAP -c $< -o $@ | |
ce9770d5 | 264 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
265 | |
266 | umf_zl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) | |
267 | - $(C) -DZLONG -DDO_VALUES -c $< -o $@ | |
ce9770d5 | 268 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
269 | |
270 | umf_zl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) | |
271 | - $(C) -DZLONG -c $< -o $@ | |
ce9770d5 | 272 | + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
273 | |
274 | umf_zl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) | |
275 | - $(C) -DZLONG -DFIXQ -c $< -o $@ | |
ce9770d5 | 276 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
277 | |
278 | umf_zl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) | |
279 | - $(C) -DZLONG -DDROP -c $< -o $@ | |
ce9770d5 | 280 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
281 | |
282 | umfpack_zl_wsolve.o: ../Source/umfpack_solve.c $(INC) | |
283 | - $(C) -DZLONG -DWSOLVE -c $< -o $@ | |
ce9770d5 | 284 | + libtool --tag=CC --mode=compile $(CC) -DZLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
285 | |
286 | umfpack_zl_%.o: ../Source/umfpack_%.c $(INC) | |
287 | - $(C) -DZLONG -c $< -o $@ | |
ce9770d5 | 288 | + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
289 | |
290 | #------------------------------------------------------------------------------- | |
291 | # Create the generic routines (GN) using a generic rule | |
292 | @@ -238,21 +236,25 @@ | |
293 | ||
294 | umfpack_gn_%.o: ../Source/umfpack_%.c $(INC) | |
295 | $(C) -c $< -o $@ | |
ce9770d5 | 296 | + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ |
3c1057dd JR |
297 | |
298 | #------------------------------------------------------------------------------- | |
299 | # Create the ../Lib/libumfpack.a library | |
300 | #------------------------------------------------------------------------------- | |
301 | ||
302 | -../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) | |
303 | - $(AR) ../Lib/libumfpack.a $^ | |
304 | - - $(RANLIB) ../Lib/libumfpack.a | |
305 | +../Lib/libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) | |
72af59f8 | 306 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) -lm -lamd -lblas |
3c1057dd JR |
307 | + |
308 | +install: libumfpack.la | |
309 | + install -d $(DESTDIR)$(libdir) | |
310 | + libtool --mode=install cp libumfpack.la $(DESTDIR)$(libdir)/libumfpack.la | |
311 | ||
312 | #------------------------------------------------------------------------------- | |
313 | # Remove all but the files in the original distribution | |
314 | #------------------------------------------------------------------------------- | |
315 | ||
316 | purge: clean | |
317 | - - $(RM) ../Lib/libumfpack.a | |
318 | + - $(RM) ../Lib/libumfpack.la | |
319 | ||
320 | clean: | |
321 | - $(RM) $(CLEAN) | |
322 | --- UMFPACK/Makefile~ 2007-12-07 01:52:29.000000000 +0100 | |
323 | +++ UMFPACK/Makefile 2007-12-07 02:10:18.000000000 +0100 | |
324 | @@ -11,8 +11,6 @@ | |
325 | # compile all C code (except hb, fortran, and fortran64), including AMD and the | |
326 | # MATLAB mexFunctions | |
327 | all: | |
328 | - ( cd ../AMD ; $(MAKE) library ) | |
329 | - ( cd ../AMD ; $(MAKE) mex ) | |
330 | ( cd Lib ; $(MAKE) ) | |
331 | ( cd Demo ; $(MAKE) ) | |
332 | ( cd MATLAB ; $(MAKE) ) | |
333 | @@ -20,7 +18,6 @@ | |
334 | ||
335 | # compile just the C-callable libraries and demo programs (not mexFunctions) | |
336 | library: | |
337 | - ( cd ../AMD ; $(MAKE) library ) | |
338 | ( cd Lib ; $(MAKE) ) | |
339 | ( cd Demo ; $(MAKE) ) | |
340 | - cat Doc/License | |
341 | @@ -39,7 +36,6 @@ | |
342 | ||
343 | # remove object files, but keep the compiled programs and library archives | |
344 | clean: | |
345 | - ( cd ../AMD ; $(MAKE) clean ) | |
346 | ( cd Lib ; $(MAKE) clean ) | |
347 | ( cd Demo ; $(MAKE) clean ) | |
348 | ( cd MATLAB ; $(MAKE) clean ) | |
349 | @@ -47,7 +43,6 @@ | |
350 | ||
351 | # clean, and then remove compiled programs and library archives | |
352 | purge: | |
353 | - ( cd ../AMD ; $(MAKE) purge ) | |
354 | ( cd Lib ; $(MAKE) purge ) | |
355 | ( cd Demo ; $(MAKE) purge ) | |
356 | ( cd MATLAB ; $(MAKE) purge ) | |
357 | @@ -55,12 +50,10 @@ | |
358 | ||
359 | # create PDF documents for the original distribution | |
360 | doc: | |
361 | - ( cd ../AMD ; $(MAKE) doc ) | |
362 | ( cd Doc ; $(MAKE) ) | |
363 | ||
364 | # get ready for distribution | |
365 | dist: purge | |
366 | - ( cd ../AMD ; $(MAKE) dist ) | |
367 | ( cd Demo ; $(MAKE) dist ) | |
368 | ( cd Doc ; $(MAKE) ) | |
369 | ||
370 | @@ -70,7 +63,6 @@ | |
371 | ||
372 | # compile the MATLAB mexFunction | |
373 | mex: | |
374 | - ( cd ../AMD/MATLAB ; $(MAKE) ) | |
375 | ( cd MATLAB ; $(MAKE) ) | |
376 | ||
377 | # statement coverage (requires Linux; takes a lot of time and disk space) |