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