amd-ufconfig.patch

   1 --- AMD/Demo/Makefile.orig      2012-05-27 01:13:34.000000000 +0200
   2 +++ AMD/Demo/Makefile   2012-06-27 15:15:08.539047966 +0200
   3 @@ -4,11 +4,11 @@
   4
   5  default: amd_simple amd_demo amd_demo2 amd_l_demo
   6
   7 -include ../../SuiteSparse_config/SuiteSparse_config.mk
   8 +include /usr/share/misc/SuiteSparse_config.mk
   9
  10 -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
  11 +C = $(CC) $(CF) -I../Include
  12
  13 -INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
  14 +INC = ../Include/amd.h
  15
  16  library:
  17         ( cd ../Lib ; $(MAKE) )
  18 --- AMD/Doc/Makefile.orig       2012-05-28 02:24:04.000000000 +0200
  19 +++ AMD/Doc/Makefile    2012-06-27 15:15:47.109046348 +0200
  20 @@ -4,7 +4,7 @@
  21
  22  default: dist
  23
  24 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  25 +include /usr/share/misc/SuiteSparse_config.mk
  26
  27  #------------------------------------------------------------------------------
  28  # Remove all but the files in the original distribution
  29 --- AMD/Include/amd.h.orig      2012-05-29 18:42:50.000000000 +0200
  30 +++ AMD/Include/amd.h   2012-06-27 15:12:34.369054437 +0200
  31 @@ -43,7 +43,7 @@
  32  /* get the definition of size_t: */
  33  #include <stddef.h>
  34
  35 -#include "SuiteSparse_config.h"
  36 +#include <SuiteSparse_config.h>
  37
  38  int amd_order                  /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
  39                                  * AMD_INVALID, or AMD_OUT_OF_MEMORY */
  40 --- AMD/Lib/Makefile.orig       2012-05-27 01:19:39.000000000 +0200
  41 +++ AMD/Lib/Makefile    2012-06-27 15:16:07.689045486 +0200
  42 @@ -8,9 +8,9 @@
  43
  44  default: everything
  45
  46 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  47 +include /usr/share/misc/SuiteSparse_config.mk
  48
  49 -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
  50 +C = $(CC) $(CF) -I../Include
  51
  52  everything:
  53         $(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
  54 --- AMD/Makefile.orig   2012-05-28 22:30:07.000000000 +0200
  55 +++ AMD/Makefile        2012-06-27 15:16:34.285711036 +0200
  56 @@ -6,7 +6,7 @@
  57
  58  default: all
  59
  60 -include ../SuiteSparse_config/SuiteSparse_config.mk
  61 +include /usr/share/misc/SuiteSparse_config.mk
  62
  63  demos: all
  64
  65 --- AMD/Lib/GNUmakefile.orig    2012-05-29 23:56:26.000000000 +0200
  66 +++ AMD/Lib/GNUmakefile 2012-06-27 15:20:21.892368141 +0200
  67 @@ -4,9 +4,9 @@
  68
  69  default: libamd.a
  70
  71 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  72 +include /usr/share/misc/SuiteSparse_config.mk
  73
  74 -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
  75 +C = $(CC) $(CF) -I../Include
  76
  77  #-------------------------------------------------------------------------------
  78  # source files
  79 @@ -15,9 +15,7 @@
  80  AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
  81         amd_order amd_control amd_info amd_valid amd_preprocess
  82
  83 -CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
  84 -
  85 -INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
  86 +INC = ../Include/amd.h ../Include/amd_internal.h
  87
  88  #-------------------------------------------------------------------------------
  89  # object files for each version