CAMD-ufconfig.patch

   1 diff -ur CAMD/Demo/camd_l_demo.c CAMD-uf/Demo/camd_l_demo.c
   2 --- CAMD/Demo/camd_l_demo.c     2007-05-03 17:16:55.000000000 +0200
   3 +++ CAMD-uf/Demo/camd_l_demo.c  2007-12-02 18:02:54.000000000 +0100
   4 @@ -16,7 +16,7 @@
   5  #include <stdlib.h>
   6
   7  /* define UF_long */
   8 -#include "UFconfig.h"
   9 +#include <UFconfig.h>
  10
  11  int main (void)
  12  {
  13 diff -ur CAMD/Demo/Makefile CAMD-uf/Demo/Makefile
  14 --- CAMD/Demo/Makefile  2007-05-05 16:25:26.000000000 +0200
  15 +++ CAMD-uf/Demo/Makefile       2007-12-02 18:01:51.000000000 +0100
  16 @@ -4,13 +4,13 @@
  17
  18  default: camd_simple camd_demo camd_demo2 camd_l_demo
  19
  20 -include ../../UFconfig/UFconfig.mk
  21 +include /usr/share/misc/UFconfig.mk
  22
  23 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
  24 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
  25
  26 -UFCONFIG = ../../UFconfig/UFconfig.h
  27 +UFCONFIG = /usr/share/misc/UFconfig.mk
  28
  29 -INC = ../Include/camd.h $(UFCONFIG)
  30 +INC = ../Include/camd.h
  31
  32  library:
  33         ( cd ../Lib ; $(MAKE) )
  34 diff -ur CAMD/Doc/Makefile CAMD-uf/Doc/Makefile
  35 --- CAMD/Doc/Makefile   2006-04-25 18:34:27.000000000 +0200
  36 +++ CAMD-uf/Doc/Makefile        2007-12-02 18:01:59.000000000 +0100
  37 @@ -4,7 +4,7 @@
  38
  39  default: dist
  40
  41 -include ../../UFconfig/UFconfig.mk
  42 +include /usr/share/misc/UFconfig.mk
  43
  44  #------------------------------------------------------------------------------
  45  # Remove all but the files in the original distribution
  46 diff -ur CAMD/Include/camd.h CAMD-uf/Include/camd.h
  47 --- CAMD/Include/camd.h 2007-05-04 17:11:54.000000000 +0200
  48 +++ CAMD-uf/Include/camd.h      2007-12-02 18:03:19.000000000 +0100
  49 @@ -45,7 +45,7 @@
  50  #include <stddef.h>
  51
  52  /* define UF_long */
  53 -#include "UFconfig.h"
  54 +#include <UFconfig.h>
  55
  56  int amd_order              /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
  57                              * AMD_INVALID, or AMD_OUT_OF_MEMORY */
  58 diff -ur CAMD/Include/camd_internal.h CAMD-uf/Include/camd_internal.h
  59 --- CAMD/Include/camd_internal.h        2007-05-03 17:26:14.000000000 +0200
  60 +++ CAMD-uf/Include/camd_internal.h     2007-12-02 18:03:11.000000000 +0100
  61 @@ -162,7 +162,7 @@
  62  /* ------------------------------------------------------------------------- */
  63
  64  /* define UF_long */
  65 -#include "UFconfig.h"
  66 +#include <UFconfig.h>
  67
  68  #if defined (DLONG) || defined (ZLONG)
  69
  70 diff -ur CAMD/Lib/Makefile CAMD-uf/Lib/Makefile
  71 --- CAMD/Lib/Makefile   2007-05-06 14:32:40.000000000 +0200
  72 +++ CAMD-uf/Lib/Makefile        2007-12-02 18:02:11.000000000 +0100
  73 @@ -8,9 +8,9 @@
  74
  75  default: everything
  76
  77 -include ../../UFconfig/UFconfig.mk
  78 +include /usr/share/misc/UFconfig.mk
  79
  80 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
  81 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
  82
  83  everything:
  84         $(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o
  85 diff -ur CAMD/Makefile CAMD-uf/Makefile
  86 --- CAMD/Makefile       2007-05-05 19:23:47.000000000 +0200
  87 +++ CAMD-uf/Makefile    2007-12-02 18:02:33.000000000 +0100
  88 @@ -4,7 +4,7 @@
  89
  90  default: demo
  91
  92 -include ../UFconfig/UFconfig.mk
  93 +include /usr/share/misc/UFconfig.mk
  94
  95  # Compile all C code, including the C-callable routines.
  96  # Do not compile the FORTRAN versions, or MATLAB interface.
  97 diff -ur CAMD/MATLAB/camd_mex.c CAMD-uf/MATLAB/camd_mex.c
  98 --- CAMD/MATLAB/camd_mex.c      2007-05-03 17:22:16.000000000 +0200
  99 +++ CAMD-uf/MATLAB/camd_mex.c   2007-12-02 18:03:32.000000000 +0100
 100 @@ -30,7 +30,7 @@
 101  #include "camd.h"
 102  #include "mex.h"
 103  #include "matrix.h"
 104 -#include "UFconfig.h"
 105 +#include <UFconfig.h>
 106
 107  void mexFunction
 108  (
 109 diff -ur CAMD/MATLAB/Makefile CAMD-uf/MATLAB/Makefile
 110 --- CAMD/MATLAB/Makefile        2007-05-03 16:02:45.000000000 +0200
 111 +++ CAMD-uf/MATLAB/Makefile     2007-12-02 18:02:24.000000000 +0100
 112 @@ -4,13 +4,13 @@
 113
 114  default: amd2
 115
 116 -include ../../UFconfig/UFconfig.mk
 117 +include /usr/share/misc/UFconfig.mk
 118
 119  CAMD = ../Lib/libcamd.a
 120
 121 -I = -I../Include -I../../UFconfig
 122 +I = -I../Include
 123
 124 -INC = ../Include/camd.h ../Include/camd_internal.h ../../UFconfig/UFconfig.h
 125 +INC = ../Include/camd.h ../Include/camd_internal.h
 126
 127  SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \
 128      ../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \
 129 --- CAMD/Lib/GNUmakefile~       2007-05-06 14:32:19.000000000 +0200
 130 +++ CAMD/Lib/GNUmakefile        2007-12-02 18:23:35.000000000 +0100
 131 @@ -4,9 +4,9 @@
 132
 133  default: ../Lib/libamd.a
 134
 135 -include ../../UFconfig/UFconfig.mk
 136 +include /usr/share/misc/UFconfig.mk
 137
 138 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
 139 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
 140
 141  #-------------------------------------------------------------------------------
 142  # source files
 143 @@ -15,9 +15,7 @@
 144  CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_post_tree camd_defaults \
 145         camd_order camd_control camd_info camd_valid camd_preprocess
 146
 147 -UFCONFIG = ../../UFconfig/UFconfig.h
 148 -
 149 -INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG)
 150 +INC = ../Include/camd.h ../Include/camd_internal.h
 151
 152  #-------------------------------------------------------------------------------
 153  # object files for each version