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
6 include /usr/share/misc/UFconfig.mk
8 -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include
9 +C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include
11 -INC = ../Include/umfpack.h ../../AMD/Include/amd.h
12 +INC = ../Include/umfpack.h
14 -LIBS = $(BLAS) $(XERBLA) $(LIB)
15 +LIBS = $(BLAS) $(XERBLA) $(LIB) -lamd
18 +../Lib/libumfpack.la:
19 ( cd ../Lib ; $(MAKE) )
21 -../../AMD/Lib/libamd.a:
22 - ( cd ../../AMD ; $(MAKE) library )
24 -UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a
25 +UMFPACK = ../Lib/libumfpack.la
28 ( cd ../Lib ; $(MAKE) )
29 - ( cd ../../AMD ; $(MAKE) library )
31 #-------------------------------------------------------------------------------
32 # Create the demo programs, run them, and compare the output
34 dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c
36 umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK)
37 - $(C) -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
38 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
40 # the GNU rules are simpler:
41 # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
43 - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c
45 umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
46 - $(C) -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
47 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
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
53 umfpack_dl_demo: umfpack_dl_demo.c $(INC) $(UMFPACK)
54 - $(C) -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
55 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
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
61 umfpack_zi_demo: umfpack_zi_demo.c $(INC) $(UMFPACK)
62 - $(C) -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
63 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
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
69 umfpack_zl_demo: umfpack_zl_demo.c $(INC) $(UMFPACK)
70 - $(C) -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
71 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
73 run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo 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
79 # UMFPACK Makefile for compiling on Unix systems (for GNU Make)
80 #-------------------------------------------------------------------------------
82 -default: ../Lib/libumfpack.a
83 +default: ../Lib/libumfpack.la
85 include /usr/share/misc/UFconfig.mk
87 -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
88 - -I../Include -I../Source -I../../AMD/Include
89 +C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source
91 #-------------------------------------------------------------------------------
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)))
101 #-------------------------------------------------------------------------------
102 # object files for each version
103 @@ -91,146 +89,146 @@
104 #-------------------------------------------------------------------------------
106 umf_i_%.o: ../Source/umf_%.c $(INC)
107 - $(C) -DDINT -c $< -o $@
108 + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
110 umf_l_%.o: ../Source/umf_%.c $(INC)
111 - $(C) -DDLONG -c $< -o $@
112 + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
114 #-------------------------------------------------------------------------------
115 # compile each routine in the DI version
116 #-------------------------------------------------------------------------------
118 umf_di_%.o: ../Source/umf_%.c $(INC)
119 - $(C) -DDINT -c $< -o $@
120 + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
122 umf_di_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
123 - $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@
124 + libtool --tag=CC --mode=compile $(CC) -DDINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
126 umf_di_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
127 - $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@
128 + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
130 umf_di_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
131 - $(C) -DDINT -DDO_MAP -c $< -o $@
132 + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
134 umf_di_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
135 - $(C) -DDINT -DDO_VALUES -c $< -o $@
136 + libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
138 umf_di_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
139 - $(C) -DDINT -c $< -o $@
140 + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
142 umf_di_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
143 - $(C) -DDINT -DFIXQ -c $< -o $@
144 + libtool --tag=CC --mode=compile $(CC) -DDINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
146 umf_di_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
147 - $(C) -DDINT -DDROP -c $< -o $@
148 + libtool --tag=CC --mode=compile $(CC) -DDINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
150 umfpack_di_wsolve.o: ../Source/umfpack_solve.c $(INC)
151 - $(C) -DDINT -DWSOLVE -c $< -o $@
152 + libtool --tag=CC --mode=compile $(CC) -DDINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
154 umfpack_di_%.o: ../Source/umfpack_%.c $(INC)
155 - $(C) -DDINT -c $< -o $@
156 + libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
158 #-------------------------------------------------------------------------------
159 # compile each routine in the DL version
160 #-------------------------------------------------------------------------------
162 umf_dl_%.o: ../Source/umf_%.c $(INC)
163 - $(C) -DDLONG -c $< -o $@
164 + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
166 umf_dl_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
167 - $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@
168 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
170 umf_dl_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
171 - $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@
172 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
174 umf_dl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
175 - $(C) -DDLONG -DDO_MAP -c $< -o $@
176 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
178 umf_dl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
179 - $(C) -DDLONG -DDO_VALUES -c $< -o $@
180 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
182 umf_dl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
183 - $(C) -DDLONG -c $< -o $@
184 + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
186 umf_dl_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
187 - $(C) -DDLONG -DFIXQ -c $< -o $@
188 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
190 umf_dl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
191 - $(C) -DDLONG -DDROP -c $< -o $@
192 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
194 umfpack_dl_wsolve.o: ../Source/umfpack_solve.c $(INC)
195 - $(C) -DDLONG -DWSOLVE -c $< -o $@
196 + libtool --tag=CC --mode=compile $(CC) -DDLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
198 umfpack_dl_%.o: ../Source/umfpack_%.c $(INC)
199 - $(C) -DDLONG -c $< -o $@
200 + libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
202 #-------------------------------------------------------------------------------
203 # compile each routine in the ZI version
204 #-------------------------------------------------------------------------------
206 umf_zi_%.o: ../Source/umf_%.c $(INC)
207 - $(C) -DZINT -c $< -o $@
208 + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
210 umf_zi_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
211 - $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@
212 + libtool --tag=CC --mode=compile $(CC) -DZINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
214 umf_zi_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
215 - $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@
216 + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
218 umf_zi_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
219 - $(C) -DZINT -DDO_MAP -c $< -o $@
220 + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
222 umf_zi_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
223 - $(C) -DZINT -DDO_VALUES -c $< -o $@
224 + libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
226 umf_zi_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
227 - $(C) -DZINT -c $< -o $@
228 + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
230 umf_zi_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
231 - $(C) -DZINT -DFIXQ -c $< -o $@
232 + libtool --tag=CC --mode=compile $(CC) -DZINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
234 umf_zi_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
235 - $(C) -DZINT -DDROP -c $< -o $@
236 + libtool --tag=CC --mode=compile $(CC) -DZINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
238 umfpack_zi_wsolve.o: ../Source/umfpack_solve.c $(INC)
239 - $(C) -DZINT -DWSOLVE -c $< -o $@
240 + libtool --tag=CC --mode=compile $(CC) -DZINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
242 umfpack_zi_%.o: ../Source/umfpack_%.c $(INC)
243 - $(C) -DZINT -c $< -o $@
244 + libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
246 #-------------------------------------------------------------------------------
247 # compile each routine in the ZL version
248 #-------------------------------------------------------------------------------
250 umf_zl_%.o: ../Source/umf_%.c $(INC)
251 - $(C) -DZLONG -c $< -o $@
252 + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
254 umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
255 - $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@
256 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
258 umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
259 - $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@
260 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
262 umf_zl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
263 - $(C) -DZLONG -DDO_MAP -c $< -o $@
264 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
266 umf_zl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
267 - $(C) -DZLONG -DDO_VALUES -c $< -o $@
268 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
270 umf_zl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
271 - $(C) -DZLONG -c $< -o $@
272 + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
274 umf_zl_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
275 - $(C) -DZLONG -DFIXQ -c $< -o $@
276 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
278 umf_zl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
279 - $(C) -DZLONG -DDROP -c $< -o $@
280 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
282 umfpack_zl_wsolve.o: ../Source/umfpack_solve.c $(INC)
283 - $(C) -DZLONG -DWSOLVE -c $< -o $@
284 + libtool --tag=CC --mode=compile $(CC) -DZLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
286 umfpack_zl_%.o: ../Source/umfpack_%.c $(INC)
287 - $(C) -DZLONG -c $< -o $@
288 + libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
290 #-------------------------------------------------------------------------------
291 # Create the generic routines (GN) using a generic rule
292 @@ -238,21 +236,25 @@
294 umfpack_gn_%.o: ../Source/umfpack_%.c $(INC)
296 + libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -c $< -o $@
298 #-------------------------------------------------------------------------------
299 # Create the ../Lib/libumfpack.a library
300 #-------------------------------------------------------------------------------
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)
306 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $^ -lm -lamd -lblas
308 +install: libumfpack.la
309 + install -d $(DESTDIR)$(libdir)
310 + libtool --mode=install cp libumfpack.la $(DESTDIR)$(libdir)/libumfpack.la
312 #-------------------------------------------------------------------------------
313 # Remove all but the files in the original distribution
314 #-------------------------------------------------------------------------------
317 - - $(RM) ../Lib/libumfpack.a
318 + - $(RM) ../Lib/libumfpack.la
322 --- UMFPACK/Makefile~ 2007-12-07 01:52:29.000000000 +0100
323 +++ UMFPACK/Makefile 2007-12-07 02:10:18.000000000 +0100
325 # compile all C code (except hb, fortran, and fortran64), including AMD and the
326 # MATLAB mexFunctions
328 - ( cd ../AMD ; $(MAKE) library )
329 - ( cd ../AMD ; $(MAKE) mex )
331 ( cd Demo ; $(MAKE) )
332 ( cd MATLAB ; $(MAKE) )
335 # compile just the C-callable libraries and demo programs (not mexFunctions)
337 - ( cd ../AMD ; $(MAKE) library )
339 ( cd Demo ; $(MAKE) )
343 # remove object files, but keep the compiled programs and library archives
345 - ( cd ../AMD ; $(MAKE) clean )
346 ( cd Lib ; $(MAKE) clean )
347 ( cd Demo ; $(MAKE) clean )
348 ( cd MATLAB ; $(MAKE) clean )
351 # clean, and then remove compiled programs and library archives
353 - ( cd ../AMD ; $(MAKE) purge )
354 ( cd Lib ; $(MAKE) purge )
355 ( cd Demo ; $(MAKE) purge )
356 ( cd MATLAB ; $(MAKE) purge )
359 # create PDF documents for the original distribution
361 - ( cd ../AMD ; $(MAKE) doc )
364 # get ready for distribution
366 - ( cd ../AMD ; $(MAKE) dist )
367 ( cd Demo ; $(MAKE) dist )
372 # compile the MATLAB mexFunction
374 - ( cd ../AMD/MATLAB ; $(MAKE) )
375 ( cd MATLAB ; $(MAKE) )
377 # statement coverage (requires Linux; takes a lot of time and disk space)