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