]>
Commit | Line | Data |
---|---|---|
becce9b4 JB |
1 | --- LDL/Makefile.orig 2011-12-07 23:49:57.000000000 +0100 |
2 | +++ LDL/Makefile 2012-01-06 11:46:41.577108834 +0100 | |
3 | @@ -6,7 +6,7 @@ | |
4 | ||
5 | default: demos | |
6 | ||
89178688 JB |
7 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
8 | +include /usr/share/misc/SuiteSparse_config.mk | |
becce9b4 JB |
9 | |
10 | # Compile all C code, including the C-callable routine. | |
11 | demos: | |
12 | --- LDL/Lib/Makefile.orig 2011-12-08 18:40:52.000000000 +0100 | |
13 | +++ LDL/Lib/Makefile 2012-01-06 12:05:28.417146565 +0100 | |
14 | @@ -4,9 +4,9 @@ | |
15 | ||
16 | default: all | |
17 | ||
89178688 JB |
18 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
19 | +include /usr/share/misc/SuiteSparse_config.mk | |
becce9b4 | 20 | |
89178688 | 21 | -I = -I../../SuiteSparse_config -I../Include |
becce9b4 JB |
22 | +I = -I../Include |
23 | ||
24 | C = $(CC) $(CF) $(I) | |
25 | ||
cb62827d JB |
26 | --- LDL/Demo/Makefile.orig 2014-10-03 17:03:06.916184859 +0200 |
27 | +++ LDL/Demo/Makefile 2014-10-03 18:57:36.315896575 +0200 | |
28 | @@ -4,19 +4,17 @@ | |
becce9b4 JB |
29 | |
30 | default: all | |
31 | ||
89178688 JB |
32 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
33 | +include /usr/share/misc/SuiteSparse_config.mk | |
becce9b4 | 34 | |
89178688 | 35 | -I = -I../../SuiteSparse_config -I../Include |
becce9b4 JB |
36 | +I = -I../Include |
37 | ||
38 | C = $(CC) $(CF) $(I) | |
39 | ||
40 | all: ldlsimple ldllsimple ldlmain ldllmain ldlamd ldllamd | |
41 | ||
cb62827d JB |
42 | -LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB) |
43 | +LIB2 = -lsuitesparseconfig $(LIB) | |
44 | ||
becce9b4 | 45 | library: |
cb62827d | 46 | - ( cd ../../SuiteSparse_config ; $(MAKE) library ) |
becce9b4 JB |
47 | - ( cd ../../AMD ; $(MAKE) library ) |
48 | ( cd ../Lib ; $(MAKE) ) | |
49 | ||
50 | #------------------------------------------------------------------------------- |