]>
Commit | Line | Data |
---|---|---|
f492f268 JB |
1 | --- SPQR/Makefile.orig 2011-12-07 23:20:52.000000000 +0100 |
2 | +++ SPQR/Makefile 2012-01-07 15:26:12.640442839 +0100 | |
3 | @@ -4,7 +4,7 @@ | |
4 | ||
5 | VERSION = 1.2.3 | |
6 | ||
9792627a JB |
7 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
8 | +include /usr/share/misc/SuiteSparse_config.mk | |
f492f268 JB |
9 | |
10 | default: all | |
11 | ||
3c239242 JB |
12 | --- SPQR/Lib/Makefile.orig 2012-06-21 07:37:08.000000000 +0200 |
13 | +++ SPQR/Lib/Makefile 2012-08-28 19:36:19.380393578 +0200 | |
f492f268 JB |
14 | @@ -6,7 +6,7 @@ |
15 | ||
16 | ccode: all | |
17 | ||
9792627a JB |
18 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
19 | +include /usr/share/misc/SuiteSparse_config.mk | |
f492f268 JB |
20 | |
21 | #------------------------------------------------------------------------------- | |
22 | # the optional Partition module requires METIS, CAMD, and CCOLAMD | |
3c239242 JB |
23 | @@ -15,18 +15,13 @@ |
24 | CONFIG = -DNPARTITION | |
f492f268 JB |
25 | # check if METIS is requested and available |
26 | ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG))) | |
3c239242 JB |
27 | - # METIS is requested. See if it is available |
28 | - ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH))) | |
f492f268 JB |
29 | - ifeq (../../CAMD, $(wildcard ../../CAMD)) |
30 | - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD)) | |
3c239242 | 31 | + # METIS is requested. |
f492f268 | 32 | + ifeq ($(WITH_METIS), 1) |
3c239242 JB |
33 | # METIS, CAMD, and CCOLAMD are available |
34 | - LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \ | |
35 | - ../../CAMD/Lib/libcamd.a | |
36 | - I_WITH_PARTITION = -I$(METIS_PATH)/Lib \ | |
37 | - -I../../CCOLAMD/Include -I../../CAMD/Include | |
38 | + LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd | |
39 | + I_WITH_PARTITION = -I/usr/include/metis \ | |
40 | + -I/usr/include/ccolamd -I/usr/include/camd | |
f492f268 JB |
41 | CONFIG = |
42 | - endif | |
43 | - endif | |
44 | endif | |
45 | endif | |
46 | #------------------------------------------------------------------------------- | |
3c239242 | 47 | @@ -97,7 +92,7 @@ |
f492f268 JB |
48 | |
49 | $(OBJ): $(INC) | |
50 | ||
9792627a | 51 | -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include |
f492f268 JB |
52 | +I = -I/usr/include/cholmod -I../Include |
53 | ||
54 | C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I) | |
55 | ||
3c239242 JB |
56 | --- SPQR/Demo/Makefile.orig 2012-06-21 07:47:51.000000000 +0200 |
57 | +++ SPQR/Demo/Makefile 2012-08-28 19:38:04.650391386 +0200 | |
f492f268 JB |
58 | @@ -6,7 +6,7 @@ |
59 | ||
60 | ccode: all | |
61 | ||
9792627a JB |
62 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
63 | +include /usr/share/misc/SuiteSparse_config.mk | |
f492f268 JB |
64 | |
65 | #------------------------------------------------------------------------------- | |
66 | # the optional Partition module requires METIS, CAMD, and CCOLAMD | |
3c239242 JB |
67 | @@ -15,26 +15,20 @@ |
68 | CONFIG = -DNPARTITION | |
f492f268 JB |
69 | # check if METIS is requested and available |
70 | ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG))) | |
3c239242 JB |
71 | - # METIS is requested. See if it is available |
72 | - ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH))) | |
f492f268 JB |
73 | - ifeq (../../CAMD, $(wildcard ../../CAMD)) |
74 | - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD)) | |
3c239242 JB |
75 | - # METIS, CAMD, and CCOLAMD are available |
76 | - LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \ | |
77 | - ../../CAMD/Lib/libcamd.a | |
78 | - I_WITH_PARTITION = -I$(METIS_PATH)/Lib \ | |
79 | - -I../../CCOLAMD/Include -I../../CAMD/Include | |
80 | + # METIS is requested. | |
f492f268 | 81 | + ifeq ($(WITH_METIS), 1) |
3c239242 JB |
82 | + LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd |
83 | + I_WITH_PARTITION = -I/usr/include/metis \ | |
84 | + -I/usr/include/ccolamd -I/usr/include/camd | |
f492f268 | 85 | CONFIG = |
f492f268 JB |
86 | - endif |
87 | - endif | |
f492f268 JB |
88 | endif |
89 | endif | |
90 | #------------------------------------------------------------------------------- | |
91 | ||
92 | CLIB = ../Lib/libspqr.a \ | |
9792627a | 93 | - ../../SuiteSparse_config/libsuitesparseconfig.a \ |
f492f268 | 94 | - ../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \ |
9792627a | 95 | - ../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION) |
3c239242 | 96 | + -lsuitesparseconfig \ |
9792627a JB |
97 | + -lcholmod -lamd \ |
98 | + -lcolamd $(LIB_WITH_PARTITION) | |
f492f268 | 99 | |
9792627a | 100 | # use the BLAS and LAPACK defined by SuiteSparse_config.mk; do not use valgrind |
f492f268 | 101 | FLIB = $(LAPACK) $(BLAS) |
3c239242 | 102 | @@ -145,7 +139,7 @@ |
f492f268 JB |
103 | ../Include/SuiteSparseQR_definitions.h \ |
104 | ../Include/SuiteSparseQR.hpp Makefile | |
105 | ||
9792627a | 106 | -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include |
f492f268 JB |
107 | +I = -I/usr/include/cholmod -I../Include |
108 | ||
109 | C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I) | |
110 |