amd-ufconfig.patch

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