projects / packages / SPQR.git / blame
| 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 | ||
| 12 | --- SPQR/Lib/Makefile.orig 2011-12-14 18:48:21.000000000 +0100 | |
| 13 | +++ SPQR/Lib/Makefile 2012-01-07 15:36:22.723796599 +0100 | |
| 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 | |
| 23 | @@ -14,13 +14,10 @@ | |
| 24 | # check if METIS is requested and available | |
| 25 | ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG))) | |
| 26 | # METIS is requested. See if it is available | |
| 27 | - ifeq ($(METIS), $(wildcard $(METIS))) | |
| 28 | - ifeq (../../CAMD, $(wildcard ../../CAMD)) | |
| 29 | - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD)) | |
| 30 | + ifeq ($(WITH_METIS), 1) | |
| 31 | + # assume CAMD and CCOLAMD are available | |
| 32 | # METIS, CAMD, and CCOLAMD is available | |
| 33 | CONFIG = | |
| 34 | - endif | |
| 35 | - endif | |
| 36 | endif | |
| 37 | endif | |
| 38 | #------------------------------------------------------------------------------- | |
| 39 | @@ -91,7 +88,7 @@ | |
| 40 | ||
| 41 | $(OBJ): $(INC) | |
| 42 | ||
| 9792627a | 43 | -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include |
| f492f268 JB |
44 | +I = -I/usr/include/cholmod -I../Include |
| 45 | ||
| 46 | C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I) | |
| 47 | ||
| 9792627a JB |
48 | --- SPQR/Demo/Makefile.orig 2012-05-28 15:15:40.000000000 +0200 |
| 49 | +++ SPQR/Demo/Makefile 2012-06-27 19:00:41.468480043 +0200 | |
| f492f268 JB |
50 | @@ -6,7 +6,7 @@ |
| 51 | ||
| 52 | ccode: all | |
| 53 | ||
| 9792627a JB |
54 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
| 55 | +include /usr/share/misc/SuiteSparse_config.mk | |
| f492f268 JB |
56 | |
| 57 | #------------------------------------------------------------------------------- | |
| 58 | # the optional Partition module requires METIS, CAMD, and CCOLAMD | |
| 9792627a | 59 | @@ -15,24 +15,17 @@ |
| f492f268 JB |
60 | # check if METIS is requested and available |
| 61 | ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG))) | |
| 62 | # METIS is requested. See if it is available | |
| 63 | - ifeq ($(METIS), $(wildcard $(METIS))) | |
| 64 | - ifeq (../../CAMD, $(wildcard ../../CAMD)) | |
| 65 | - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD)) | |
| 9792627a | 66 | - # METIS, CAMD, and CCOLAMD is available |
| f492f268 | 67 | + ifeq ($(WITH_METIS), 1) |
| 9792627a | 68 | + # assume that METIS, CAMD, and CCOLAMD are available |
| f492f268 JB |
69 | CONFIG = |
| 70 | - LIB_WITH_PARTITION = $(METIS) \ | |
| 71 | - ../../CCOLAMD/Lib/libccolamd.a \ | |
| 72 | - ../../CAMD/Lib/libcamd.a | |
| 73 | - endif | |
| 74 | - endif | |
| 75 | + LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd | |
| 76 | endif | |
| 77 | endif | |
| 78 | #------------------------------------------------------------------------------- | |
| 79 | ||
| 80 | CLIB = ../Lib/libspqr.a \ | |
| 9792627a | 81 | - ../../SuiteSparse_config/libsuitesparseconfig.a \ |
| f492f268 | 82 | - ../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \ |
| 9792627a JB |
83 | - ../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION) |
| 84 | + -lcholmod -lamd \ | |
| 85 | + -lcolamd $(LIB_WITH_PARTITION) | |
| f492f268 | 86 | |
| 9792627a | 87 | # use the BLAS and LAPACK defined by SuiteSparse_config.mk; do not use valgrind |
| f492f268 | 88 | FLIB = $(LAPACK) $(BLAS) |
| 9792627a | 89 | @@ -140,7 +133,7 @@ |
| f492f268 JB |
90 | ../Include/SuiteSparseQR_definitions.h \ |
| 91 | ../Include/SuiteSparseQR.hpp Makefile | |
| 92 | ||
| 9792627a | 93 | -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include |
| f492f268 JB |
94 | +I = -I/usr/include/cholmod -I../Include |
| 95 | ||
| 96 | C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I) | |
| 97 |