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      2014-03-21 20:21:27.000000000 +0100
  38 +++ KLU/Demo/Makefile   2014-10-03 16:36:20.732918931 +0200
  39 @@ -3,23 +3,16 @@
  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 -        ../../SuiteSparse_config/libsuitesparseconfig.a
  49 +CLIB = ../Lib/libklu.a -lbtf -lamd -lcolamd -lsuitesparseconfig
  50
  51 -CHOLMOD_LIB = ../../CHOLMOD/Lib/libcholmod.a
  52 -CHOLMOD = $(CHOLMOD_LIB) $(LAPACK) $(BLAS) $(XERBLA)
  53 +CHOLMOD = -lcholmod
  54
  55 -ifneq ($(GPU_CONFIG),)
  56 -CHOLMOD += $(CUDART_LIB) $(CUBLAS_LIB)
  57 -endif
  58 +I = -I/usr/include/amd -I/usr/include/colamd \
  59 +       -I/usr/include/btf -I../Include -I/usr/include/cholmod
  60
  61 -I = -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include \
  62 -       -I../../BTF/Include -I../Include -I../../CHOLMOD/Include
  63 -
  64 -all: $(CLIB) klu_simple $(CHOLMOD_LIB) kludemo kluldemo
  65 +all: $(CLIB) klu_simple kludemo kluldemo
  66         - ./klu_simple
  67         - ./kludemo < ../Matrix/1c.mtx
  68         - ./kludemo < ../Matrix/arrowc.mtx
  69 @@ -37,24 +30,6 @@
  70  ../Lib/libklu.a:
  71         ( cd ../Lib ; $(MAKE) )
  72
  73 -../../BTF/Lib/libbtf.a:
  74 -       ( cd ../../BTF ; $(MAKE) library )
  75 -
  76 -../../AMD/Lib/libamd.a:
  77 -       ( cd ../../AMD ; $(MAKE) library )
  78 -
  79 -../../COLAMD/Lib/libcolamd.a:
  80 -       ( cd ../../COLAMD ; $(MAKE) library )
  81 -
  82 -../../CHOLMOD/Lib/libcholmod.a:
  83 -       ( cd ../../CHOLMOD ; $(MAKE) library )
  84 -#      ( cd ../../CAMD ; $(MAKE) )
  85 -#      ( cd ../../CCOLAMD ; $(MAKE) )
  86 -#      ( cd ../../metis-4.0 ; $(MAKE) )
  87 -
  88 -../../SuiteSparse_config/libsuitesparseconfig.a:
  89 -       ( cd ../../SuiteSparse_config ; $(MAKE) )
  90 -
  91  purge: distclean
  92
  93  distclean: clean