]>
Commit | Line | Data |
---|---|---|
23d2a546 JB |
1 | --- COLAMD/Demo/Makefile.orig 2014-10-01 21:32:41.549424470 +0200 |
2 | +++ COLAMD/Demo/Makefile 2014-10-02 17:21:56.629763313 +0200 | |
3 | @@ -23,12 +23,12 @@ | |
bc1d5db9 | 4 | dist: |
411aa683 | 5 | |
bc1d5db9 | 6 | colamd_example: colamd_example.c library |
23d2a546 JB |
7 | - $(C) -o colamd_example colamd_example.c ../Lib/libcolamd.a $(LIB2) |
8 | + libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_example colamd_example.c ../Lib/libcolamd.la $(LIB2) | |
411aa683 ER |
9 | - ./colamd_example > my_colamd_example.out |
10 | - diff colamd_example.out my_colamd_example.out | |
11 | ||
bc1d5db9 | 12 | colamd_l_example: colamd_l_example.c library |
23d2a546 JB |
13 | - $(C) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.a $(LIB2) |
14 | + libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o colamd_l_example colamd_l_example.c ../Lib/libcolamd.la $(LIB2) | |
411aa683 | 15 | - ./colamd_l_example > my_colamd_l_example.out |
23d2a546 | 16 | - diff colamd_l_example.out my_colamd_l_example.out |
411aa683 | 17 | |
23d2a546 JB |
18 | --- COLAMD/Lib/Makefile.orig 2014-10-02 17:24:27.669756976 +0200 |
19 | +++ COLAMD/Lib/Makefile 2014-10-02 18:14:05.969631988 +0200 | |
bc1d5db9 JR |
20 | @@ -2,7 +2,8 @@ |
21 | # COLAMD Makefile | |
22 | #------------------------------------------------------------------------------- | |
411aa683 | 23 | |
bc1d5db9 JR |
24 | -default: libcolamd.a |
25 | +default: libcolamd.la | |
26 | +libdir := /usr/lib | |
27 | ||
e0318b64 | 28 | include /usr/share/misc/SuiteSparse_config.mk |
411aa683 | 29 | |
23d2a546 JB |
30 | @@ -13,15 +14,18 @@ |
31 | SRC = ../Source/colamd.c | |
411aa683 ER |
32 | |
33 | # creates libcolamd.a, a C-callable COLAMD library | |
bc1d5db9 | 34 | -libcolamd.a: $(SRC) $(INC) |
6e77168e JB |
35 | - $(CC) $(CF) $(I) -c ../Source/colamd.c |
36 | - $(CC) $(CF) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o | |
23d2a546 | 37 | - $(ARCHIVE) libcolamd.a colamd.o colamd_l.o |
6e77168e | 38 | - - $(RANLIB) libcolamd.a |
bc1d5db9 | 39 | +libcolamd.la: $(SRC) $(INC) |
6e77168e JB |
40 | + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/colamd.c |
41 | + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/colamd.c -DDLONG -o colamd_l.o | |
23d2a546 | 42 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o libcolamd.la -rpath $(libdir) colamd.lo colamd_l.lo -lsuitesparseconfig -lm |
411aa683 ER |
43 | + |
44 | +install: libcolamd.la | |
45 | + install -d $(DESTDIR)$(libdir) | |
23d2a546 | 46 | + libtool --mode=install install libcolamd.la $(DESTDIR)$(libdir) |
6e77168e | 47 | + |
411aa683 ER |
48 | +ccode: libcolamd.la |
49 | ||
6e77168e JB |
50 | -ccode: libcolamd.a |
51 | - | |
411aa683 ER |
52 | -library: libcolamd.a |
53 | +library: libcolamd.la | |
54 | ||
55 | clean: | |
56 | - $(RM) $(CLEAN) | |
23d2a546 | 57 | @@ -29,4 +33,4 @@ |
bc1d5db9 JR |
58 | purge: distclean |
59 | ||
60 | distclean: clean | |
61 | - - $(RM) libcolamd.a | |
62 | + - $(RM) libcolamd.la |