projects / packages / KLU.git / blame
| Commit | Line | Data |
|---|---|---|
| 0726bacd JB |
1 | --- KLU/Lib/Makefile.orig 2012-01-29 18:59:19.771183432 +0100 |
| 2 | +++ KLU/Lib/Makefile 2012-01-29 21:25:04.354809566 +0100 | |
| e6c7c7e2 JB |
3 | @@ -17,7 +17,7 @@ |
| 4 | ||
| 5 | all: library | |
| 6 | ||
| 7 | -library: libklu.a | |
| 8 | +library: libklu.la | |
| 9 | ||
| 10 | KLU_D = klu_d.o klu_d_kernel.o klu_d_dump.o \ | |
| 11 | klu_d_factor.o klu_d_free_numeric.o klu_d_solve.o \ | |
| 12 | @@ -47,109 +47,112 @@ | |
| 13 | ||
| 14 | OBJ = $(COMMON) $(KLU_D) $(KLU_Z) $(KLU_L) $(KLU_ZL) | |
| 15 | ||
| 16 | -libklu.a: $(OBJ) | |
| 0726bacd JB |
17 | - $(ARCHIVE) libklu.a $(OBJ) |
| 18 | - - $(RANLIB) libklu.a | |
| e6c7c7e2 JB |
19 | +libklu.la: $(OBJ) |
| 20 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libklu.la -rpath $(libdir) $(OBJ:.o=.lo) -lcolamd -lamd -lbtf -lm | |
| 21 | + | |
| 22 | +install: libklu.la | |
| 23 | + install -d $(DESTDIR)$(libdir) | |
| 24 | + libtool --mode=install cp libklu.la $(DESTDIR)$(libdir)/libklu.la | |
| 25 | ||
| 26 | $(OBJ): $(INC) | |
| 27 | ||
| 28 | #------------------------------------------------------------------------------- | |
| 29 | ||
| 30 | klu_d.o: ../Source/klu.c | |
| 31 | - $(C) -c $(I) $< -o $@ | |
| 32 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 33 | ||
| 34 | klu_z.o: ../Source/klu.c | |
| 35 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 36 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 37 | ||
| 38 | klu_d_kernel.o: ../Source/klu_kernel.c | |
| 39 | - $(C) -c $(I) $< -o $@ | |
| 40 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 41 | ||
| 42 | klu_z_kernel.o: ../Source/klu_kernel.c | |
| 43 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 44 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 45 | ||
| 46 | klu_d_sort.o: ../Source/klu_sort.c | |
| 47 | - $(C) -c $(I) $< -o $@ | |
| 48 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 49 | ||
| 50 | klu_z_sort.o: ../Source/klu_sort.c | |
| 51 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 52 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 53 | ||
| 54 | klu_d_diagnostics.o: ../Source/klu_diagnostics.c | |
| 55 | - $(C) -c $(I) $< -o $@ | |
| 56 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 57 | ||
| 58 | klu_z_diagnostics.o: ../Source/klu_diagnostics.c | |
| 59 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 60 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 61 | ||
| 62 | klu_d_dump.o: ../Source/klu_dump.c | |
| 63 | - $(C) -c $(I) $< -o $@ | |
| 64 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 65 | ||
| 66 | klu_z_dump.o: ../Source/klu_dump.c | |
| 67 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 68 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 69 | ||
| 70 | klu_d_factor.o: ../Source/klu_factor.c | |
| 71 | - $(C) -c $(I) $< -o $@ | |
| 72 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 73 | ||
| 74 | klu_z_factor.o: ../Source/klu_factor.c | |
| 75 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 76 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 77 | ||
| 78 | klu_d_free_numeric.o: ../Source/klu_free_numeric.c | |
| 79 | - $(C) -c $(I) $< -o $@ | |
| 80 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 81 | ||
| 82 | klu_z_free_numeric.o: ../Source/klu_free_numeric.c | |
| 83 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 84 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 85 | ||
| 86 | klu_d_extract.o: ../Source/klu_extract.c | |
| 87 | - $(C) -c $(I) $< -o $@ | |
| 88 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 89 | ||
| 90 | klu_z_extract.o: ../Source/klu_extract.c | |
| 91 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 92 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 93 | ||
| 94 | klu_d_refactor.o: ../Source/klu_refactor.c | |
| 95 | - $(C) -c $(I) $< -o $@ | |
| 96 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 97 | ||
| 98 | klu_z_refactor.o: ../Source/klu_refactor.c | |
| 99 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 100 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 101 | ||
| 102 | klu_d_scale.o: ../Source/klu_scale.c | |
| 103 | - $(C) -c $(I) $< -o $@ | |
| 104 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 105 | ||
| 106 | klu_z_scale.o: ../Source/klu_scale.c | |
| 107 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 108 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 109 | ||
| 110 | klu_d_solve.o: ../Source/klu_solve.c | |
| 111 | - $(C) -c $(I) $< -o $@ | |
| 112 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 113 | ||
| 114 | klu_z_solve.o: ../Source/klu_solve.c | |
| 115 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 116 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 117 | ||
| 118 | klu_d_tsolve.o: ../Source/klu_tsolve.c | |
| 119 | - $(C) -c $(I) $< -o $@ | |
| 120 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 121 | ||
| 122 | klu_z_tsolve.o: ../Source/klu_tsolve.c | |
| 123 | - $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 124 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX $(I) $< -o $@ | |
| 125 | ||
| 126 | #------------------------------------------------------------------------------- | |
| 127 | ||
| 128 | klu_analyze.o: ../Source/klu_analyze.c | |
| 129 | - $(C) -c $(I) $< -o $@ | |
| 130 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 131 | ||
| 132 | klu_analyze_given.o: ../Source/klu_analyze_given.c | |
| 133 | - $(C) -c $(I) $< -o $@ | |
| 134 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 135 | ||
| 136 | klu_defaults.o: ../Source/klu_defaults.c | |
| 137 | - $(C) -c $(I) $< -o $@ | |
| 138 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 139 | ||
| 140 | klu_free_symbolic.o: ../Source/klu_free_symbolic.c | |
| 141 | - $(C) -c $(I) $< -o $@ | |
| 142 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 143 | ||
| 144 | klu_memory.o: ../Source/klu_memory.c | |
| 145 | - $(C) -c $(I) $< -o $@ | |
| 146 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o $@ | |
| 147 | ||
| 148 | #------------------------------------------------------------------------------- | |
| 149 | ||
| 150 | purge: distclean | |
| 151 | ||
| 152 | distclean: clean | |
| 153 | - - $(RM) libklu.a | |
| 0726bacd | 154 | + - $(RM) libklu.la |
| e6c7c7e2 JB |
155 | |
| 156 | clean: | |
| 157 | - $(RM) $(CLEAN) | |
| 158 | @@ -157,92 +160,92 @@ | |
| 159 | #------------------------------------------------------------------------------- | |
| 160 | ||
| 161 | klu_l.o: ../Source/klu.c | |
| 162 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 163 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 164 | ||
| 165 | klu_zl.o: ../Source/klu.c | |
| 166 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 167 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 168 | ||
| 169 | klu_l_kernel.o: ../Source/klu_kernel.c | |
| 170 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 171 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 172 | ||
| 173 | klu_zl_kernel.o: ../Source/klu_kernel.c | |
| 174 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 175 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 176 | ||
| 177 | klu_l_sort.o: ../Source/klu_sort.c | |
| 178 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 179 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 180 | ||
| 181 | klu_zl_sort.o: ../Source/klu_sort.c | |
| 182 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 183 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 184 | ||
| 185 | klu_l_diagnostics.o: ../Source/klu_diagnostics.c | |
| 186 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 187 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 188 | ||
| 189 | klu_zl_diagnostics.o: ../Source/klu_diagnostics.c | |
| 190 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 191 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 192 | ||
| 193 | klu_l_dump.o: ../Source/klu_dump.c | |
| 194 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 195 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 196 | ||
| 197 | klu_zl_dump.o: ../Source/klu_dump.c | |
| 198 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 199 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 200 | ||
| 201 | klu_l_factor.o: ../Source/klu_factor.c | |
| 202 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 203 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 204 | ||
| 205 | klu_zl_factor.o: ../Source/klu_factor.c | |
| 206 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 207 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 208 | ||
| 209 | klu_l_free_numeric.o: ../Source/klu_free_numeric.c | |
| 210 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 211 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 212 | ||
| 213 | klu_zl_free_numeric.o: ../Source/klu_free_numeric.c | |
| 214 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 215 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 216 | ||
| 217 | klu_l_extract.o: ../Source/klu_extract.c | |
| 218 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 219 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 220 | ||
| 221 | klu_zl_extract.o: ../Source/klu_extract.c | |
| 222 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 223 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 224 | ||
| 225 | klu_l_refactor.o: ../Source/klu_refactor.c | |
| 226 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 227 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 228 | ||
| 229 | klu_zl_refactor.o: ../Source/klu_refactor.c | |
| 230 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 231 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 232 | ||
| 233 | klu_l_scale.o: ../Source/klu_scale.c | |
| 234 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 235 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 236 | ||
| 237 | klu_zl_scale.o: ../Source/klu_scale.c | |
| 238 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 239 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 240 | ||
| 241 | klu_l_solve.o: ../Source/klu_solve.c | |
| 242 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 243 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 244 | ||
| 245 | klu_zl_solve.o: ../Source/klu_solve.c | |
| 246 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 247 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 248 | ||
| 249 | klu_l_tsolve.o: ../Source/klu_tsolve.c | |
| 250 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 251 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 252 | ||
| 253 | klu_zl_tsolve.o: ../Source/klu_tsolve.c | |
| 254 | - $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 255 | + libtool --tag=CC --mode=compile $(C) -c -DCOMPLEX -DDLONG $(I) $< -o $@ | |
| 256 | ||
| 257 | #------------------------------------------------------------------------------- | |
| 258 | ||
| 259 | klu_l_analyze.o: ../Source/klu_analyze.c | |
| 260 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 261 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 262 | ||
| 263 | klu_l_analyze_given.o: ../Source/klu_analyze_given.c | |
| 264 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 265 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 266 | ||
| 267 | klu_l_defaults.o: ../Source/klu_defaults.c | |
| 268 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 269 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 270 | ||
| 271 | klu_l_free_symbolic.o: ../Source/klu_free_symbolic.c | |
| 272 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 273 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 274 | ||
| 275 | klu_l_memory.o: ../Source/klu_memory.c | |
| 276 | - $(C) -c -DDLONG $(I) $< -o $@ | |
| 277 | + libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@ | |
| 278 | ||
| 279 | #------------------------------------------------------------------------------- | |
| 8b190b63 JB |
280 | --- KLU/Demo/Makefile.orig 2014-10-03 16:36:48.796251087 +0200 |
| 281 | +++ KLU/Demo/Makefile 2014-10-03 16:39:42.522910463 +0200 | |
| e6c7c7e2 JB |
282 | @@ -5,7 +5,7 @@ |
| 283 | ||
| b9f6cd16 | 284 | include /usr/share/misc/SuiteSparse_config.mk |
| e6c7c7e2 | 285 | |
| 8b190b63 JB |
286 | -CLIB = ../Lib/libklu.a -lbtf -lamd -lcolamd -lsuitesparseconfig |
| 287 | +CLIB = ../Lib/libklu.la -lbtf -lamd -lcolamd -lsuitesparseconfig | |
| e6c7c7e2 JB |
288 | |
| 289 | CHOLMOD = -lcholmod | |
| 290 | ||
| 291 | @@ -27,7 +27,7 @@ | |
| 292 | - ./kluldemo < ../Matrix/w156.mtx | |
| 293 | - ./kluldemo < ../Matrix/ctina.mtx | |
| 294 | ||
| 295 | -../Lib/libklu.a: | |
| 296 | +../Lib/libklu.la: | |
| 297 | ( cd ../Lib ; $(MAKE) ) | |
| 298 | ||
| 299 | purge: distclean | |
| 300 | @@ -40,11 +40,11 @@ | |
| 301 | - $(RM) $(CLEAN) | |
| 302 | ||
| b9f6cd16 JB |
303 | kludemo: kludemo.c Makefile $(CLIB) |
| 304 | - $(CC) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB) | |
| 305 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB) | |
| e6c7c7e2 | 306 | |
| b9f6cd16 JB |
307 | kluldemo: kludemo.c Makefile $(CLIB) |
| 308 | - $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB) | |
| 309 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB) | |
| e6c7c7e2 | 310 | |
| b9f6cd16 JB |
311 | klu_simple: klu_simple.c Makefile $(CLIB) |
| 312 | - $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB) | |
| 313 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB) | |
| e6c7c7e2 | 314 | - ./klu_simple |