1 --- UMFPACK/Demo/Makefile.orig 2011-01-28 16:54:05.792693904 +0100
2 +++ UMFPACK/Demo/Makefile 2011-01-28 16:56:24.156689713 +0100
5 C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd
7 -INC = ../Include/umfpack.h ../../AMD/Include/amd.h
8 +INC = ../Include/umfpack.h
10 -LIBS = $(BLAS) $(XERBLA) $(LIB)
11 +LIBS = $(BLAS) $(XERBLA) $(LIB) -lamd
14 +../Lib/libumfpack.la:
15 ( cd ../Lib ; $(MAKE) )
17 -../../AMD/Lib/libamd.a:
18 - ( cd ../../AMD ; $(MAKE) library )
20 -../../CHOLMOD/Lib/libcholmod.a:
21 - ( cd ../../CHOLMOD ; $(MAKE) library )
23 -../../COLAMD/Lib/libcolamd.a:
24 - ( cd ../../COLAMD ; $(MAKE) library )
26 -../../CCOLAMD/Lib/libccolamd.a:
27 - ( cd ../../CCOLAMD ; $(MAKE) library )
29 -../../CAMD/Lib/libcamd.a:
30 - ( cd ../../CAMD ; $(MAKE) library )
33 ( cd $(METIS_PATH) ; $(MAKE) )
35 -UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
36 - ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
37 - ../../CAMD/Lib/libcamd.a $(METIS) \
38 - ../../CCOLAMD/Lib/libccolamd.a
39 +UMFPACK = ../Lib/libumfpack.la
44 dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c
46 umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK)
47 - $(C) -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
48 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -o umfpack_simple umfpack_simple.c $(UMFPACK) $(LIBS)
50 # the GNU rules are simpler:
51 # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
53 - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c
55 umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
56 - $(C) -o umfpack_di_demo umfpack_di_demo.c $(UMFPACK) $(LIBS)
57 + 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)
59 # double-precision, UF_long verion:
60 umfpack_dl_demo.c: umfpack_xx_demo.c umfpack_dl_demo.sed
61 - sed -f umfpack_dl_demo.sed < umfpack_xx_demo.c > umfpack_dl_demo.c
63 umfpack_dl_demo: umfpack_dl_demo.c $(INC) $(UMFPACK)
64 - $(C) -o umfpack_dl_demo umfpack_dl_demo.c $(UMFPACK) $(LIBS)
65 + 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)
67 # complex, int verion:
68 umfpack_zi_demo.c: umfpack_xx_demo.c umfpack_zi_demo.sed
69 - sed -f umfpack_zi_demo.sed < umfpack_xx_demo.c > umfpack_zi_demo.c
71 umfpack_zi_demo: umfpack_zi_demo.c $(INC) $(UMFPACK)
72 - $(C) -o umfpack_zi_demo umfpack_zi_demo.c $(UMFPACK) $(LIBS)
73 + 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)
75 # complex, UF_long verion:
76 umfpack_zl_demo.c: umfpack_xx_demo.c umfpack_zl_demo.sed
77 - sed -f umfpack_zl_demo.sed < umfpack_xx_demo.c > umfpack_zl_demo.c
79 umfpack_zl_demo: umfpack_zl_demo.c $(INC) $(UMFPACK)
80 - $(C) -o umfpack_zl_demo umfpack_zl_demo.c $(UMFPACK) $(LIBS)
81 + 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)
83 run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple
85 --- UMFPACK/Lib/GNUmakefile.orig 2010-10-13 20:56:34.119741882 +0200
86 +++ UMFPACK/Lib/GNUmakefile 2010-10-13 20:57:29.679734339 +0200
88 # UMFPACK Makefile for compiling on Unix systems (for GNU Make)
89 #-------------------------------------------------------------------------------
91 -default: libumfpack.a
92 +default: libumfpack.la
94 include /usr/share/misc/UFconfig.mk
97 $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \
98 $(addprefix ../Source/, $(addsuffix .h,$(UMFINT))) \
99 $(addprefix ../Include/, $(addsuffix .h,$(USER))) \
100 - $(addprefix ../Include/, $(addsuffix .h,$(GENERIC))) \
101 - ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h
102 + $(addprefix ../Include/, $(addsuffix .h,$(GENERIC)))
104 #-------------------------------------------------------------------------------
105 # object files for each version
106 @@ -91,171 +90,171 @@
107 #-------------------------------------------------------------------------------
109 umf_i_%.o: ../Source/umf_%.c $(INC)
110 - $(C) -DDINT -c $< -o $@
111 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
113 umf_l_%.o: ../Source/umf_%.c $(INC)
114 - $(C) -DDLONG -c $< -o $@
115 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
117 #-------------------------------------------------------------------------------
118 # compile each routine in the DI version
119 #-------------------------------------------------------------------------------
121 umf_di_%.o: ../Source/umf_%.c $(INC)
122 - $(C) -DDINT -c $< -o $@
123 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
125 umf_di_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
126 - $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@
127 + libtool --tag=CC --mode=compile $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@
129 umf_di_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
130 - $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@
131 + libtool --tag=CC --mode=compile $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@
133 umf_di_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
134 - $(C) -DDINT -DDO_MAP -c $< -o $@
135 + libtool --tag=CC --mode=compile $(C) -DDINT -DDO_MAP -c $< -o $@
137 umf_di_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
138 - $(C) -DDINT -DDO_VALUES -c $< -o $@
139 + libtool --tag=CC --mode=compile $(C) -DDINT -DDO_VALUES -c $< -o $@
141 umf_di_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
142 - $(C) -DDINT -c $< -o $@
143 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
145 umf_di_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
146 - $(C) -DDINT -DFIXQ -c $< -o $@
147 + libtool --tag=CC --mode=compile $(C) -DDINT -DFIXQ -c $< -o $@
149 umf_di_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
150 - $(C) -DDINT -DDROP -c $< -o $@
151 + libtool --tag=CC --mode=compile $(C) -DDINT -DDROP -c $< -o $@
153 umfpack_di_wsolve.o: ../Source/umfpack_solve.c $(INC)
154 - $(C) -DDINT -DWSOLVE -c $< -o $@
155 + libtool --tag=CC --mode=compile $(C) -DDINT -DWSOLVE -c $< -o $@
157 umfpack_di_%.o: ../Source/umfpack_%.c $(INC)
158 - $(C) -DDINT -c $< -o $@
159 + libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
161 #-------------------------------------------------------------------------------
162 # compile each routine in the DL version
163 #-------------------------------------------------------------------------------
165 umf_dl_%.o: ../Source/umf_%.c $(INC)
166 - $(C) -DDLONG -c $< -o $@
167 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
169 umf_dl_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
170 - $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@
171 + libtool --tag=CC --mode=compile $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@
173 umf_dl_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
174 - $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@
175 + libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@
177 umf_dl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
178 - $(C) -DDLONG -DDO_MAP -c $< -o $@
179 + libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_MAP -c $< -o $@
181 umf_dl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
182 - $(C) -DDLONG -DDO_VALUES -c $< -o $@
183 + libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_VALUES -c $< -o $@
185 umf_dl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
186 - $(C) -DDLONG -c $< -o $@
187 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
189 umf_dl_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
190 - $(C) -DDLONG -DFIXQ -c $< -o $@
191 + libtool --tag=CC --mode=compile $(C) -DDLONG -DFIXQ -c $< -o $@
193 umf_dl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
194 - $(C) -DDLONG -DDROP -c $< -o $@
195 + libtool --tag=CC --mode=compile $(C) -DDLONG -DDROP -c $< -o $@
197 umfpack_dl_wsolve.o: ../Source/umfpack_solve.c $(INC)
198 - $(C) -DDLONG -DWSOLVE -c $< -o $@
199 + libtool --tag=CC --mode=compile $(C) -DDLONG -DWSOLVE -c $< -o $@
201 umfpack_dl_%.o: ../Source/umfpack_%.c $(INC)
202 - $(C) -DDLONG -c $< -o $@
203 + libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
205 #-------------------------------------------------------------------------------
206 # compile each routine in the ZI version
207 #-------------------------------------------------------------------------------
209 umf_zi_%.o: ../Source/umf_%.c $(INC)
210 - $(C) -DZINT -c $< -o $@
211 + libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@
213 umf_zi_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
214 - $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@
215 + libtool --tag=CC --mode=compile $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@
217 umf_zi_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
218 - $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@
219 + libtool --tag=CC --mode=compile $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@
221 umf_zi_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
222 - $(C) -DZINT -DDO_MAP -c $< -o $@
223 + libtool --tag=CC --mode=compile $(C) -DZINT -DDO_MAP -c $< -o $@
225 umf_zi_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
226 - $(C) -DZINT -DDO_VALUES -c $< -o $@
227 + libtool --tag=CC --mode=compile $(C) -DZINT -DDO_VALUES -c $< -o $@
229 umf_zi_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
230 - $(C) -DZINT -c $< -o $@
231 + libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@
233 umf_zi_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
234 - $(C) -DZINT -DFIXQ -c $< -o $@
235 + libtool --tag=CC --mode=compile $(C) -DZINT -DFIXQ -c $< -o $@
237 umf_zi_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
238 - $(C) -DZINT -DDROP -c $< -o $@
239 + libtool --tag=CC --mode=compile $(C) -DZINT -DDROP -c $< -o $@
241 umfpack_zi_wsolve.o: ../Source/umfpack_solve.c $(INC)
242 - $(C) -DZINT -DWSOLVE -c $< -o $@
243 + libtool --tag=CC --mode=compile $(C) -DZINT -DWSOLVE -c $< -o $@
245 umfpack_zi_%.o: ../Source/umfpack_%.c $(INC)
246 - $(C) -DZINT -c $< -o $@
247 + libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@
249 #-------------------------------------------------------------------------------
250 # compile each routine in the ZL version
251 #-------------------------------------------------------------------------------
253 umf_zl_%.o: ../Source/umf_%.c $(INC)
254 - $(C) -DZLONG -c $< -o $@
255 + libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@
257 umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
258 - $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@
259 + libtool --tag=CC --mode=compile $(C) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@
261 umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
262 - $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@
263 + libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@
265 umf_zl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC)
266 - $(C) -DZLONG -DDO_MAP -c $< -o $@
267 + libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_MAP -c $< -o $@
269 umf_zl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC)
270 - $(C) -DZLONG -DDO_VALUES -c $< -o $@
271 + libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_VALUES -c $< -o $@
273 umf_zl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC)
274 - $(C) -DZLONG -c $< -o $@
275 + libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@
277 umf_zl_assemble_fixq.o: ../Source/umf_assemble.c $(INC)
278 - $(C) -DZLONG -DFIXQ -c $< -o $@
279 + libtool --tag=CC --mode=compile $(C) -DZLONG -DFIXQ -c $< -o $@
281 umf_zl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC)
282 - $(C) -DZLONG -DDROP -c $< -o $@
283 + libtool --tag=CC --mode=compile $(C) -DZLONG -DDROP -c $< -o $@
285 umfpack_zl_wsolve.o: ../Source/umfpack_solve.c $(INC)
286 - $(C) -DZLONG -DWSOLVE -c $< -o $@
287 + libtool --tag=CC --mode=compile $(C) -DZLONG -DWSOLVE -c $< -o $@
289 umfpack_zl_%.o: ../Source/umfpack_%.c $(INC)
290 - $(C) -DZLONG -c $< -o $@
291 + libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@
293 #-------------------------------------------------------------------------------
294 # Create the generic routines (GN) using a generic rule
295 #-------------------------------------------------------------------------------
297 umfpack_gn_%.o: ../Source/umfpack_%.c $(INC)
299 + libtool --tag=CC --mode=compile $(C) -c $< -o $@
301 #-------------------------------------------------------------------------------
302 # Create the libumfpack.a library
303 #-------------------------------------------------------------------------------
305 -libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
306 - $(AR) libumfpack.a $^
307 - - $(RANLIB) libumfpack.a
308 +libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
309 + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) -lm -lamd -lcholmod -lblas
311 -so: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
312 - gcc -shared -Wl,-soname,libumfpack.so -o libumfpack.so $^
313 +install: libumfpack.la
314 + install -d $(DESTDIR)$(libdir)
315 + libtool --mode=install install libumfpack.la $(DESTDIR)$(libdir)
317 #-------------------------------------------------------------------------------
318 # Remove all but the files in the original distribution
319 #-------------------------------------------------------------------------------
322 - - $(RM) libumfpack.a
323 + - $(RM) libumfpack.la
327 --- UMFPACK/Makefile.orig 2010-10-13 19:57:37.315740205 +0200
328 +++ UMFPACK/Makefile 2010-10-13 20:23:19.519734339 +0200
333 -# UMFPACK requires the AMD package to be in ../AMD
337 include /usr/share/misc/UFconfig.mk
339 # compile all C code (except hb, fortran, and fortran64), including AMD and the
340 # demos, but not the MATLAB mexFunctions
342 - ( cd ../AMD ; $(MAKE) library )
344 ( cd Demo ; $(MAKE) )
347 # compile just the C-callable libraries and demo programs (not mexFunctions)
349 - ( cd ../AMD ; $(MAKE) library )
352 # compile the FORTRAN interface and demo program
355 # remove object files, but keep the compiled programs and library archives
357 - ( cd ../AMD ; $(MAKE) clean )
358 ( cd Lib ; $(MAKE) clean )
359 ( cd Demo ; $(MAKE) clean )
360 ( cd MATLAB ; $(MAKE) clean )
363 # clean, and then remove compiled programs and library archives
365 - ( cd ../AMD ; $(MAKE) purge )
366 ( cd Lib ; $(MAKE) purge )
367 ( cd Demo ; $(MAKE) purge )
368 ( cd MATLAB ; $(MAKE) purge )
371 # create PDF documents for the original distribution
373 - ( cd ../AMD ; $(MAKE) doc )
376 # get ready for distribution
378 - ( cd ../AMD ; $(MAKE) dist )
379 ( cd Demo ; $(MAKE) dist )
384 # compile the MATLAB mexFunction for AMD (but not UMFPACK)
386 - ( cd ../AMD/MATLAB ; $(MAKE) )
387 # ( cd MATLAB ; $(MAKE) )
389 # statement coverage (requires Linux; takes a lot of time and disk space)