]> git.pld-linux.org Git - packages/KLU.git/blob - KLU-ufconfig.patch
14b384b7637df2f62affca5c8a569bc5f45763e7
[packages/KLU.git] / KLU-ufconfig.patch
1 --- KLU/Makefile.orig   2009-11-07 18:37:57.000000000 +0100
2 +++ KLU/Makefile        2012-01-10 17:39:06.842722146 +0100
3 @@ -2,7 +2,7 @@
4  
5  default: demos
6  
7 -include ../SuiteSparse_config/SuiteSparse_config.mk
8 +include /usr/share/misc/SuiteSparse_config.mk
9  
10  demos:
11         ( cd Lib ; $(MAKE) )
12 --- KLU/Lib/Makefile.orig       2009-11-11 21:16:32.000000000 +0100
13 +++ KLU/Lib/Makefile    2012-01-10 17:41:46.846060837 +0100
14 @@ -2,7 +2,7 @@
15  
16  ccode: all
17  
18 -include ../../SuiteSparse_config/SuiteSparse_config.mk
19 +include /usr/share/misc/SuiteSparse_config.mk
20  
21  # for testing only:
22  # TEST = -DTESTING
23 @@ -10,10 +10,10 @@
24  C = $(CC) $(CFLAGS)
25  
26  INC = ../Include/klu.h ../Include/klu_internal.h ../Include/klu_version.h \
27 -    ../../SuiteSparse_config/SuiteSparse_config.h Makefile
28 +    Makefile
29  
30 -I = -I../../AMD/Include -I../../COLAMD/Include -I../../BTF/Include \
31 -    -I../Include -I../../SuiteSparse_config
32 +I = -I/usr/include/amd -I/usr/include/colamd -I/usr/include/btf \
33 +    -I../Include
34  
35  all: library
36  
37 --- KLU/Demo/Makefile.orig      2012-05-28 15:30:41.000000000 +0200
38 +++ KLU/Demo/Makefile   2012-06-28 21:30:59.997809043 +0200
39 @@ -3,16 +3,14 @@
40  
41  default: all
42  
43 -include ../../SuiteSparse_config/SuiteSparse_config.mk
44 +include /usr/share/misc/SuiteSparse_config.mk
45  
46 -CLIB = ../Lib/libklu.a  ../../BTF/Lib/libbtf.a \
47 -       ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a
48 +CLIB = ../Lib/libklu.a  -lbtf -lamd -lcolamd
49  
50 -CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
51 -        ../../SuiteSparse_config/libsuitesparseconfig.a
52 +CHOLMOD = -lcholmod
53  
54 -I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \
55 -       -I../../BTF/Include -I../Include -I../../CHOLMOD/Include
56 +I = -I/usr/include/amd -I/usr/include/colamd \
57 +       -I/usr/include/btf -I../Include -I/usr/include/cholmod
58  
59  all: $(CLIB) klu_simple $(CHOLMOD) kludemo kluldemo
60         - ./klu_simple
61 @@ -32,24 +30,6 @@
62  ../Lib/libklu.a:
63         ( cd ../Lib ; $(MAKE) )
64  
65 -../../BTF/Lib/libbtf.a:
66 -       ( cd ../../BTF ; $(MAKE) library )
67 -
68 -../../AMD/Lib/libamd.a:
69 -       ( cd ../../AMD ; $(MAKE) library )
70 -
71 -../../COLAMD/Lib/libcolamd.a:
72 -       ( cd ../../COLAMD ; $(MAKE) library )
73 -
74 -../../CHOLMOD/Lib/libcholmod.a:
75 -       ( cd ../../CHOLMOD ; $(MAKE) library )
76 -#      ( cd ../../CAMD ; $(MAKE) )
77 -#      ( cd ../../CCOLAMD ; $(MAKE) )
78 -#      ( cd ../../metis-4.0 ; $(MAKE) )
79 -
80 -../../SuiteSparse_config/libsuitesparseconfig.a:
81 -       ( cd ../../SuiteSparse_config ; $(MAKE) )
82 -
83  purge: distclean
84  
85  distclean: clean
This page took 0.055295 seconds and 2 git commands to generate.