projects / packages / RBio.git / blame
| Commit | Line | Data |
|---|---|---|
| 973cc81e JB |
1 | --- RBio/Lib/Makefile.orig 2012-01-09 17:07:19.559765294 +0100 |
| 2 | +++ RBio/Lib/Makefile 2012-01-09 17:13:03.056443463 +0100 | |
| 3 | @@ -10,14 +10,14 @@ | |
| 4 | ||
| 5 | C = $(CC) $(CF) | |
| 6 | ||
| 7 | -all: librbio.a | |
| 8 | +all: librbio.la | |
| 9 | ||
| 10 | -library: librbio.a | |
| 11 | +library: librbio.la | |
| 12 | ||
| 13 | purge: distclean | |
| 14 | ||
| 15 | distclean: clean | |
| 16 | - - $(RM) librbio.a | |
| 17 | + - $(RM) librbio.la | |
| 18 | ||
| 19 | clean: | |
| 20 | - $(RM) $(CLEAN) | |
| 21 | @@ -32,22 +32,25 @@ | |
| 22 | # The 7 CHOLMOD library modules (int, double) | |
| 23 | #------------------------------------------------------------------------------- | |
| 24 | ||
| 25 | -CORE = RBio.o | |
| 26 | +CORE = RBio_i.o | |
| 27 | ||
| 28 | DI = $(CORE) | |
| 29 | ||
| 30 | -LCORE = RBio_long.o | |
| 31 | +LCORE = RBio.o | |
| 32 | ||
| 33 | DL = $(LCORE) | |
| 34 | ||
| 35 | #------------------------------------------------------------------------------- | |
| 36 | ||
| 37 | # to compile just the double/int version, use OBJ = $(DI) | |
| 38 | -OBJ = $(DI) | |
| 39 | +OBJ = $(DI) $(DL) | |
| 40 | ||
| 41 | -librbio.a: $(OBJ) | |
| 42 | - $(ARCHIVE) librbio.a $(OBJ) | |
| 43 | - - $(RANLIB) librbio.a | |
| 44 | +librbio.la: $(OBJ) | |
| e625450f | 45 | + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o librbio.la -rpath $(libdir) $(OBJ:.o=.lo) -lsuitesparseconfig |
| 973cc81e JB |
46 | + |
| 47 | +install: librbio.la | |
| 48 | + install -d $(DESTDIR)$(libdir) | |
| 49 | + libtool --mode=install cp librbio.la $(DESTDIR)$(libdir)/librbio.la | |
| 50 | ||
| 51 | $(OBJ): $(INC) | |
| 52 | ||
| 53 | @@ -56,8 +59,8 @@ | |
| 54 | #------------------------------------------------------------------------------- | |
| 55 | ||
| 56 | RBio.o: ../Source/RBio.c | |
| 57 | - $(C) -c $(I) $< | |
| 58 | + libtool --tag=CC --mode=compile $(C) -c $(I) $< -o RBio.lo | |
| 59 | ||
| 60 | RBio_i.o: ../Source/RBio.c | |
| 61 | - $(C) -c -DINT $(I) $< | |
| 62 | + libtool --tag=CC --mode=compile $(C) -c -DINT $(I) $< -o RBio_i.lo | |
| 63 | ||
| e625450f JB |
64 | --- RBio/Demo/Makefile.orig 2012-06-27 21:43:09.000000000 +0200 |
| 65 | +++ RBio/Demo/Makefile 2012-06-27 21:43:50.571402567 +0200 | |
| 973cc81e JB |
66 | @@ -6,7 +6,7 @@ |
| 67 | ||
| e625450f | 68 | include /usr/share/misc/SuiteSparse_config.mk |
| 973cc81e | 69 | |
| e625450f JB |
70 | -CLIB = ../Lib/librbio.a -lsuitesparseconfig $(LIB) |
| 71 | +CLIB = ../Lib/librbio.la -lsuitesparseconfig $(LIB) | |
| 973cc81e JB |
72 | |
| 73 | C = $(CC) $(CF) | |
| 74 | ||
| 75 | @@ -32,5 +32,5 @@ | |
| 76 | I = -I../Include | |
| 77 | ||
| 78 | RBdemo: library RBdemo.c | |
| e625450f JB |
79 | - $(C) -o RBdemo $(I) RBdemo.c $(CLIB) |
| 80 | + libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o RBdemo $(I) RBdemo.c $(CLIB) | |
| 973cc81e | 81 |