projects / packages / CCOLAMD.git / blame
| Commit | Line | Data |
|---|---|---|
| 979439cc JB |
1 | --- CCOLAMD/Demo/Makefile.orig 2014-10-02 18:27:24.372931816 +0200 |
| 2 | +++ CCOLAMD/Demo/Makefile 2014-10-02 19:24:24.356121609 +0200 | |
| 3 | @@ -23,12 +23,12 @@ | |
| 3029277c JR |
4 | dist: |
| 5 | ||
| 6 | ccolamd_example: ccolamd_example.c library | |
| 979439cc JB |
7 | - $(C) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.a $(LIB2) |
| 8 | + libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o ccolamd_example ccolamd_example.c ../Lib/libccolamd.la $(LIB2) | |
| 3029277c JR |
9 | - ./ccolamd_example > my_ccolamd_example.out |
| 10 | - diff ccolamd_example.out my_ccolamd_example.out | |
| 11 | ||
| 12 | ccolamd_l_example: ccolamd_l_example.c library | |
| 979439cc JB |
13 | - $(C) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.a $(LIB2) |
| 14 | + libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o ccolamd_l_example ccolamd_l_example.c ../Lib/libccolamd.la $(LIB2) | |
| 3029277c | 15 | - ./ccolamd_l_example > my_ccolamd_l_example.out |
| 979439cc | 16 | - diff ccolamd_l_example.out my_ccolamd_l_example.out |
| 3029277c | 17 | |
| 979439cc JB |
18 | --- CCOLAMD/Lib/Makefile.orig 2014-10-02 20:27:21.509296447 +0200 |
| 19 | +++ CCOLAMD/Lib/Makefile 2014-10-02 20:35:12.779276670 +0200 | |
| 3029277c JR |
20 | @@ -2,7 +2,8 @@ |
| 21 | # CCOLAMD Makefile | |
| 22 | #------------------------------------------------------------------------------- | |
| 23 | ||
| 24 | -default: libccolamd.a | |
| 25 | +default: libccolamd.la | |
| 26 | +libdir := /usr/lib | |
| 27 | ||
| 928ad810 | 28 | include /usr/share/misc/SuiteSparse_config.mk |
| 3029277c | 29 | |
| 979439cc JB |
30 | @@ -13,15 +14,18 @@ |
| 31 | SRC = ../Source/ccolamd.c | |
| 3029277c JR |
32 | |
| 33 | # creates libccolamd.a, a C-callable COLAMD library | |
| 34 | -libccolamd.a: $(SRC) $(INC) | |
| 5592d417 JB |
35 | - $(CC) $(CF) $(I) -c ../Source/ccolamd.c |
| 36 | - $(CC) $(CF) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o | |
| 979439cc | 37 | - $(ARCHIVE) libccolamd.a ccolamd.o ccolamd_l.o |
| 5592d417 | 38 | - - $(RANLIB) libccolamd.a |
| 3029277c | 39 | +libccolamd.la: $(SRC) $(INC) |
| 5592d417 JB |
40 | + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/ccolamd.c |
| 41 | + libtool --tag=CC --mode=compile $(CC) $(CF) $(I) -c ../Source/ccolamd.c -DDLONG -o ccolamd_l.o | |
| 979439cc | 42 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o libccolamd.la -rpath $(libdir) ccolamd.lo ccolamd_l.lo -lsuitesparseconfig -lm |
| 3029277c JR |
43 | + |
| 44 | +install: libccolamd.la | |
| 45 | + install -d $(DESTDIR)$(libdir) | |
| 979439cc | 46 | + libtool --mode=install install libccolamd.la $(DESTDIR)$(libdir) |
| 3029277c JR |
47 | |
| 48 | -ccode: libccolamd.a | |
| 49 | +ccode: libccolamd.la | |
| 50 | ||
| 51 | -library: libccolamd.a | |
| 52 | +library: libccolamd.la | |
| 53 | ||
| 54 | clean: | |
| 55 | - $(RM) $(CLEAN) | |
| 979439cc | 56 | @@ -29,4 +33,4 @@ |
| 3029277c JR |
57 | purge: distclean |
| 58 | ||
| 59 | distclean: clean | |
| 60 | - - $(RM) libccolamd.a | |
| 61 | + - $(RM) libccolamd.la |