1 --- SPQR/Lib/Makefile.orig 2012-01-08 12:07:16.049602813 +0100
2 +++ SPQR/Lib/Makefile 2012-01-08 12:22:07.552965999 +0100
4 #-------------------------------------------------------------------------------
5 # the optional Partition module requires METIS, CAMD, and CCOLAMD
8 # check if METIS is requested and available
9 ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
10 # METIS is requested. See if it is available
12 # assume CAMD and CCOLAMD are available
13 # METIS, CAMD, and CCOLAMD is available
15 + LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
18 #-------------------------------------------------------------------------------
20 # -Wredundant-decls -Wdisabled-optimization \
39 C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)
42 - $(ARCHIVE) libspqr.a $(OBJ)
43 - - $(RANLIB) libspqr.a
45 + libtool --tag=CC --mode=link $(CXX) $(LDFLAGS) -o libspqr.la -rpath $(libdir) $(OBJ:.o=.lo) \
46 + -lcholmod $(LIB_WITH_PARTITION) -lm
49 + install -d $(DESTDIR)$(libdir)
50 + libtool --mode=install cp libspqr.la $(DESTDIR)$(libdir)/libspqr.la
52 spqr_1colamd.o: ../Source/spqr_1colamd.cpp
54 + libtool --tag=CXX --mode=compile $(C) -c $<
56 spqr_1factor.o: ../Source/spqr_1factor.cpp
58 + libtool --tag=CXX --mode=compile $(C) -c $<
60 spqr_1fixed.o: ../Source/spqr_1fixed.cpp
62 + libtool --tag=CXX --mode=compile $(C) -c $<
64 spqr_analyze.o: ../Source/spqr_analyze.cpp
66 + libtool --tag=CXX --mode=compile $(C) -c $<
68 spqr_parallel.o: ../Source/spqr_parallel.cpp
70 + libtool --tag=CXX --mode=compile $(C) -c $<
72 spqr_kernel.o: ../Source/spqr_kernel.cpp
74 + libtool --tag=CXX --mode=compile $(C) -c $<
76 spqr_append.o: ../Source/spqr_append.cpp
78 + libtool --tag=CXX --mode=compile $(C) -c $<
80 spqr_assemble.o: ../Source/spqr_assemble.cpp
82 + libtool --tag=CXX --mode=compile $(C) -c $<
84 spqr_cpack.o: ../Source/spqr_cpack.cpp
86 + libtool --tag=CXX --mode=compile $(C) -c $<
88 spqr_csize.o: ../Source/spqr_csize.cpp
90 + libtool --tag=CXX --mode=compile $(C) -c $<
92 spqr_cumsum.o: ../Source/spqr_cumsum.cpp
94 + libtool --tag=CXX --mode=compile $(C) -c $<
96 spqr_debug.o: ../Source/spqr_debug.cpp
98 + libtool --tag=CXX --mode=compile $(C) -c $<
100 spqr_factorize.o: ../Source/spqr_factorize.cpp
102 + libtool --tag=CXX --mode=compile $(C) -c $<
104 spqr_fcsize.o: ../Source/spqr_fcsize.cpp
106 + libtool --tag=CXX --mode=compile $(C) -c $<
108 spqr_freefac.o: ../Source/spqr_freefac.cpp
110 + libtool --tag=CXX --mode=compile $(C) -c $<
112 spqr_freenum.o: ../Source/spqr_freenum.cpp
114 + libtool --tag=CXX --mode=compile $(C) -c $<
116 spqr_freesym.o: ../Source/spqr_freesym.cpp
118 + libtool --tag=CXX --mode=compile $(C) -c $<
120 spqr_fsize.o: ../Source/spqr_fsize.cpp
122 + libtool --tag=CXX --mode=compile $(C) -c $<
124 spqr_happly.o: ../Source/spqr_happly.cpp
126 + libtool --tag=CXX --mode=compile $(C) -c $<
128 spqr_panel.o: ../Source/spqr_panel.cpp
130 + libtool --tag=CXX --mode=compile $(C) -c $<
132 spqr_happly_work.o: ../Source/spqr_happly_work.cpp
134 + libtool --tag=CXX --mode=compile $(C) -c $<
136 spqr_hpinv.o: ../Source/spqr_hpinv.cpp
138 + libtool --tag=CXX --mode=compile $(C) -c $<
140 spqr_larftb.o: ../Source/spqr_larftb.cpp
142 + libtool --tag=CXX --mode=compile $(C) -c $<
144 spqr_rconvert.o: ../Source/spqr_rconvert.cpp
146 + libtool --tag=CXX --mode=compile $(C) -c $<
148 spqr_rcount.o: ../Source/spqr_rcount.cpp
150 + libtool --tag=CXX --mode=compile $(C) -c $<
152 spqr_rhpack.o: ../Source/spqr_rhpack.cpp
154 + libtool --tag=CXX --mode=compile $(C) -c $<
156 spqr_rsolve.o: ../Source/spqr_rsolve.cpp
158 + libtool --tag=CXX --mode=compile $(C) -c $<
160 spqr_shift.o: ../Source/spqr_shift.cpp
162 + libtool --tag=CXX --mode=compile $(C) -c $<
164 spqr_stranspose1.o: ../Source/spqr_stranspose1.cpp
166 + libtool --tag=CXX --mode=compile $(C) -c $<
168 spqr_stranspose2.o: ../Source/spqr_stranspose2.cpp
170 + libtool --tag=CXX --mode=compile $(C) -c $<
172 spqr_trapezoidal.o: ../Source/spqr_trapezoidal.cpp
174 + libtool --tag=CXX --mode=compile $(C) -c $<
176 spqr_type.o: ../Source/spqr_type.cpp
178 + libtool --tag=CXX --mode=compile $(C) -c $<
180 spqr_front.o: ../Source/spqr_front.cpp
182 + libtool --tag=CXX --mode=compile $(C) -c $<
184 SuiteSparseQR_expert.o: ../Source/SuiteSparseQR_expert.cpp
186 + libtool --tag=CXX --mode=compile $(C) -c $<
188 spqr_maxcolnorm.o: ../Source/spqr_maxcolnorm.cpp
190 + libtool --tag=CXX --mode=compile $(C) -c $<
192 SuiteSparseQR_qmult.o: ../Source/SuiteSparseQR_qmult.cpp
194 + libtool --tag=CXX --mode=compile $(C) -c $<
196 SuiteSparseQR.o: ../Source/SuiteSparseQR.cpp
198 + libtool --tag=CXX --mode=compile $(C) -c $<
200 spqr_tol.o: ../Source/spqr_tol.cpp
202 + libtool --tag=CXX --mode=compile $(C) -c $<
204 SuiteSparseQR_C.o: ../Source/SuiteSparseQR_C.cpp
206 + libtool --tag=CXX --mode=compile $(C) -c $<
208 spqr_rmap.o: ../Source/spqr_rmap.cpp
210 + libtool --tag=CXX --mode=compile $(C) -c $<
211 --- SPQR/Demo/Makefile.orig 2012-08-28 19:39:55.567055739 +0200
212 +++ SPQR/Demo/Makefile 2012-08-28 19:40:51.427054575 +0200
215 #-------------------------------------------------------------------------------
217 -CLIB = ../Lib/libspqr.a \
218 +CLIB = ../Lib/libspqr.la \
219 -lsuitesparseconfig \
221 -lcolamd $(LIB_WITH_PARTITION)
222 @@ -146,22 +146,22 @@
223 LIBS = $(CLIB) $(LIB) $(FLIB) $(TBB)
225 qrsimple: qrsimple.cpp library $(INC)
226 - $(C) qrsimple.cpp -o qrsimple $(LIBS)
227 + libtool --mode=link --tag=CXX $(C) qrsimple.cpp -o qrsimple $(LIBS)
229 qrdemo: qrdemo.cpp library $(INC)
230 - $(C) qrdemo.cpp -o qrdemo $(LIBS)
231 + libtool --mode=link --tag=CXX $(C) qrdemo.cpp -o qrdemo $(LIBS)
233 # compile the C code with gcc, but link with g++ to use SuiteSparseQR:
235 qrdemoc.o: qrdemoc.c $(INC)
236 - $(CC) $(CF) $(SPQR_CONFIG) -ansi $(I) -c $<
237 + libtool --mode=compile --tag=CC $(CC) $(CF) $(SPQR_CONFIG) -ansi $(I) -c $<
239 qrdemoc: qrdemoc.o library $(INC)
240 - $(C) -o qrdemoc qrdemoc.o $(LIBS)
241 + libtool --mode=link --tag=CXX $(C) -o qrdemoc qrdemoc.o $(LIBS)
243 qrsimplec.o: qrsimplec.c $(INC)
244 - $(CC) $(CF) $(SPQR_CONFIG) -ansi $(I) -c $<
245 + libtool --mode=compile --tag=CC $(CC) $(CF) $(SPQR_CONFIG) -ansi $(I) -c $<
247 qrsimplec: qrsimplec.o library $(INC)
248 - $(C) -o qrsimplec qrsimplec.o $(LIBS)
249 + libtool --mode=link --tag=CXX $(C) -o qrsimplec qrsimplec.o $(LIBS)