]>
Commit | Line | Data |
---|---|---|
973cc81e JB |
1 | --- RBio/Makefile.orig 2011-12-07 23:20:05.000000000 +0100 |
2 | +++ RBio/Makefile 2012-01-08 14:28:27.806553147 +0100 | |
3 | @@ -6,7 +6,7 @@ | |
4 | ||
5 | default: all | |
6 | ||
e625450f JB |
7 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
8 | +include /usr/share/misc/SuiteSparse_config.mk | |
973cc81e JB |
9 | |
10 | # Compile the C-callable libraries and the Demo programs. | |
11 | all: | |
12 | --- RBio/Lib/Makefile.orig 2011-12-08 18:41:19.000000000 +0100 | |
13 | +++ RBio/Lib/Makefile 2012-01-08 14:38:26.373239855 +0100 | |
14 | @@ -6,7 +6,7 @@ | |
15 | ||
16 | ccode: all | |
17 | ||
e625450f JB |
18 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
19 | +include /usr/share/misc/SuiteSparse_config.mk | |
973cc81e JB |
20 | |
21 | C = $(CC) $(CF) | |
22 | ||
23 | @@ -51,7 +51,7 @@ | |
24 | ||
25 | $(OBJ): $(INC) | |
26 | ||
e625450f | 27 | -I = -I../Include -I../../SuiteSparse_config |
973cc81e JB |
28 | +I = -I../Include |
29 | ||
30 | #------------------------------------------------------------------------------- | |
31 | ||
e625450f JB |
32 | --- RBio/Demo/Makefile.orig 2012-05-27 03:17:26.000000000 +0200 |
33 | +++ RBio/Demo/Makefile 2012-06-27 21:42:48.921405153 +0200 | |
973cc81e JB |
34 | @@ -4,9 +4,9 @@ |
35 | ||
36 | default: all | |
37 | ||
e625450f JB |
38 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
39 | +include /usr/share/misc/SuiteSparse_config.mk | |
973cc81e | 40 | |
e625450f JB |
41 | -CLIB = ../Lib/librbio.a ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB) |
42 | +CLIB = ../Lib/librbio.a -lsuitesparseconfig $(LIB) | |
973cc81e JB |
43 | |
44 | C = $(CC) $(CF) | |
45 | ||
46 | @@ -26,11 +26,10 @@ | |
47 | ||
48 | #------------------------------------------------------------------------------- | |
49 | library: | |
e625450f | 50 | - ( cd ../../SuiteSparse_config ; $(MAKE) ) |
973cc81e JB |
51 | ( cd ../Lib ; $(MAKE) ) |
52 | #------------------------------------------------------------------------------- | |
53 | ||
e625450f | 54 | -I = -I../Include -I../../SuiteSparse_config |
973cc81e JB |
55 | +I = -I../Include |
56 | ||
57 | RBdemo: library RBdemo.c | |
e625450f | 58 | $(C) -o RBdemo $(I) RBdemo.c $(CLIB) |