CHOLMOD-ufconfig.patch

   1 diff -ur CHOLMOD/Demo/Makefile CHOLMOD-uf/Demo/Makefile
   2 --- CHOLMOD/Demo/Makefile       2007-05-05 16:37:46.000000000 +0200
   3 +++ CHOLMOD-uf/Demo/Makefile    2007-12-02 17:10:39.000000000 +0100
   4 @@ -7,7 +7,7 @@
   5
   6  default: all
   7
   8 -include ../../UFconfig/UFconfig.mk
   9 +include /usr/share/misc/UFconfig.mk
  10
  11  #-------------------------------------------------------------------------------
  12  # With METIS, CCOLAMD, CAMD, and the Partition Module:
  13 @@ -64,7 +64,7 @@
  14  #      ( cd ../../COLAMD ; $(MAKE) )
  15  #-------------------------------------------------------------------------------
  16
  17 -I = -I../Include -I../../UFconfig
  18 +I = -I../Include
  19
  20  cholmod_demo: library cholmod_demo.c cholmod_demo.h
  21         $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
  22 diff -ur CHOLMOD/Doc/Makefile CHOLMOD-uf/Doc/Makefile
  23 --- CHOLMOD/Doc/Makefile        2007-05-03 23:32:54.000000000 +0200
  24 +++ CHOLMOD-uf/Doc/Makefile     2007-12-02 17:10:52.000000000 +0100
  25 @@ -1,6 +1,6 @@
  26  default: all
  27
  28 -include ../../UFconfig/UFconfig.mk
  29 +include /usr/share/misc/UFconfig.mk
  30
  31  all: UserGuide.pdf
  32
  33 diff -ur CHOLMOD/Include/cholmod.h CHOLMOD-uf/Include/cholmod.h
  34 --- CHOLMOD/Include/cholmod.h   2006-12-13 14:31:07.000000000 +0100
  35 +++ CHOLMOD-uf/Include/cholmod.h        2007-12-02 17:12:47.000000000 +0100
  36 @@ -84,7 +84,7 @@
  37  #include "cholmod_io64.h"
  38
  39  /* define UF_long */
  40 -#include "UFconfig.h"
  41 +#include <UFconfig.h>
  42
  43  #include "cholmod_config.h"
  44
  45 diff -ur CHOLMOD/Include/cholmod_internal.h CHOLMOD-uf/Include/cholmod_internal.h
  46 --- CHOLMOD/Include/cholmod_internal.h  2007-09-28 20:31:04.000000000 +0200
  47 +++ CHOLMOD-uf/Include/cholmod_internal.h       2007-12-02 17:13:05.000000000 +0100
  48 @@ -201,7 +201,7 @@
  49   * It can also be redefined for other platforms, by modifying UFconfig.h.
  50   */
  51
  52 -#include "UFconfig.h"
  53 +#include <UFconfig.h>
  54
  55  /* -------------------------------------------------------------------------- */
  56  /* Size_max: the largest value of size_t */
  57 diff -ur CHOLMOD/Lib/Makefile CHOLMOD-uf/Lib/Makefile
  58 --- CHOLMOD/Lib/Makefile        2007-05-05 16:36:56.000000000 +0200
  59 +++ CHOLMOD-uf/Lib/Makefile     2007-12-02 17:11:09.000000000 +0100
  60 @@ -6,7 +6,7 @@
  61
  62  ccode: all
  63
  64 -include ../../UFconfig/UFconfig.mk
  65 +include /usr/share/misc/UFconfig.mk
  66
  67  C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
  68
  69 @@ -117,7 +117,7 @@
  70
  71  I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
  72         -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
  73 -       -I../Include -I../../UFconfig
  74 +       -I../Include
  75
  76  #-------------------------------------------------------------------------------
  77  # Check Module:
  78 diff -ur CHOLMOD/Makefile CHOLMOD-uf/Makefile
  79 --- CHOLMOD/Makefile    2006-11-30 17:40:08.000000000 +0100
  80 +++ CHOLMOD-uf/Makefile 2007-12-02 17:12:17.000000000 +0100
  81 @@ -7,7 +7,7 @@
  82
  83  default: all
  84
  85 -include ../UFconfig/UFconfig.mk
  86 +include /usr/share/misc/UFconfig.mk
  87
  88  # Compile the C-callable libraries and the Demo programs.
  89  all:
  90 diff -ur CHOLMOD/MATLAB/cholmod_matlab.h CHOLMOD-uf/MATLAB/cholmod_matlab.h
  91 --- CHOLMOD/MATLAB/cholmod_matlab.h     2007-06-14 19:52:47.000000000 +0200
  92 +++ CHOLMOD-uf/MATLAB/cholmod_matlab.h  2007-12-02 17:13:28.000000000 +0100
  93 @@ -4,7 +4,7 @@
  94
  95  /* Shared prototypes and definitions for CHOLMOD mexFunctions */
  96
  97 -#include "UFconfig.h"
  98 +#include <UFconfig.h>
  99  #ifndef DLONG
 100  #define DLONG
 101  #endif
 102 diff -ur CHOLMOD/MATLAB/Makefile CHOLMOD-uf/MATLAB/Makefile
 103 --- CHOLMOD/MATLAB/Makefile     2007-05-05 19:08:13.000000000 +0200
 104 +++ CHOLMOD-uf/MATLAB/Makefile  2007-12-02 17:11:22.000000000 +0100
 105 @@ -4,10 +4,10 @@
 106
 107  default: all
 108
 109 -include ../../UFconfig/UFconfig.mk
 110 +include /usr/share/misc/UFconfig.mk
 111
 112  I = -I. -I../../AMD/Include -I../../COLAMD/Include -I../../CCOLAMD/Include \
 113 -    -I../../CAMD/Include -I../Include -I../../UFconfig -I$(METIS_PATH)/Lib
 114 +    -I../../CAMD/Include -I../Include -I$(METIS_PATH)/Lib
 115
 116  all: mread sdmult ldlsolve resymbol symbfact2 chol2 lchol \
 117         ldlchol cholmod2 ldlupdate metis bisect nesdis etree2 sparse2 analyze \
 118 diff -ur CHOLMOD/Tcov/Makefile CHOLMOD-uf/Tcov/Makefile
 119 --- CHOLMOD/Tcov/Makefile       2007-05-05 19:12:46.000000000 +0200
 120 +++ CHOLMOD-uf/Tcov/Makefile    2007-12-02 17:11:45.000000000 +0100
 121 @@ -5,7 +5,7 @@
 122  # If you compile CHOLMOD with -DNPARTITION, then you do not need METIS,
 123  # CCOLAMD, or the Partition module.
 124
 125 -include ../../UFconfig/UFconfig.mk
 126 +include /usr/share/misc/UFconfig.mk
 127  include Make.inc
 128
 129  # Tcov requires gcc
 130 @@ -31,7 +31,7 @@
 131
 132  I = -I../../AMD/Include -I../../COLAMD/Include \
 133         -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
 134 -       -I../Include -I../../UFconfig
 135 +       -I../Include
 136
 137  default: cm cl z_demo l_demo cmread clread
 138