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 ../UFconfig/UFconfig.mk
   8 +include /usr/share/misc/UFconfig.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 ../../UFconfig/UFconfig.mk
  19 +include /usr/share/misc/UFconfig.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 -    ../../UFconfig/UFconfig.h Makefile
  28 +    Makefile
  29
  30 -I = -I../../AMD/Include -I../../COLAMD/Include -I../../BTF/Include \
  31 -    -I../Include -I../../UFconfig
  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      2009-11-11 21:13:13.000000000 +0100
  38 +++ KLU/Demo/Makefile   2012-01-10 18:40:07.339511379 +0100
  39 @@ -3,15 +3,14 @@
  40
  41  default: all
  42
  43 -include ../../UFconfig/UFconfig.mk
  44 +include /usr/share/misc/UFconfig.mk
  45
  46 -LIB = ../Lib/libklu.a  ../../BTF/Lib/libbtf.a \
  47 -       ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a
  48 +LIB = ../Lib/libklu.a -lbtf -lamd -lcolamd
  49
  50 -CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a
  51 +CHOLMOD = -lcholmod
  52
  53 -I = -I../../UFconfig -I../../AMD/Include -I../../COLAMD/Include \
  54 -       -I../../BTF/Include -I../Include -I../../CHOLMOD/Include
  55 +I = -I/usr/include/amd -I/usr/include/colamd \
  56 +       -I/usr/include/btf -I../Include -I/usr/include/cholmod
  57
  58  all: $(LIB) klu_simple $(CHOLMOD) kludemo kluldemo
  59         - ./klu_simple
  60 @@ -31,21 +30,6 @@
  61  ../Lib/libklu.a:
  62         ( cd ../Lib ; $(MAKE) )
  63
  64 -../../BTF/Lib/libbtf.a:
  65 -       ( cd ../../BTF ; $(MAKE) library )
  66 -
  67 -../../AMD/Lib/libamd.a:
  68 -       ( cd ../../AMD ; $(MAKE) library )
  69 -
  70 -../../COLAMD/Lib/libcolamd.a:
  71 -       ( cd ../../COLAMD ; $(MAKE) library )
  72 -
  73 -../../CHOLMOD/Lib/libcholmod.a:
  74 -       ( cd ../../CHOLMOD ; $(MAKE) library )
  75 -#      ( cd ../../CAMD ; $(MAKE) )
  76 -#      ( cd ../../CCOLAMD ; $(MAKE) )
  77 -#      ( cd ../../metis-4.0 ; $(MAKE) )
  78 -
  79  purge: distclean
  80
  81  distclean: clean