CAMD-ufconfig.patch

   1 --- CAMD/Demo/Makefile.orig     2012-05-27 01:23:01.000000000 +0200
   2 +++ CAMD/Demo/Makefile  2012-06-27 16:48:20.148813310 +0200
   3 @@ -4,16 +4,15 @@
   4
   5  default: camd_simple camd_demo camd_demo2 camd_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/camd.h ../../SuiteSparse_config/SuiteSparse_config.h
  14 +INC = ../Include/camd.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  #------------------------------------------------------------------------------
  24 diff -ur CAMD/Doc/Makefile CAMD-uf/Doc/Makefile
  25 --- CAMD/Doc/Makefile   2006-04-25 18:34:27.000000000 +0200
  26 +++ CAMD-uf/Doc/Makefile        2007-12-02 18:01:59.000000000 +0100
  27 @@ -4,7 +4,7 @@
  28
  29  default: dist
  30
  31 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  32 +include /usr/share/misc/SuiteSparse_config.mk
  33
  34  #------------------------------------------------------------------------------
  35  # Remove all but the files in the original distribution
  36 --- CAMD/Include/camd.h.orig    2012-05-29 18:43:27.000000000 +0200
  37 +++ CAMD/Include/camd.h 2012-06-27 16:22:56.608877247 +0200
  38 @@ -31,7 +31,7 @@
  39  /* get the definition of size_t: */
  40  #include <stddef.h>
  41
  42 -#include "SuiteSparse_config.h"
  43 +#include <SuiteSparse_config.h>
  44
  45  int camd_order              /* returns CAMD_OK, CAMD_OK_BUT_JUMBLED,
  46                               * CAMD_INVALID, or CAMD_OUT_OF_MEMORY */
  47 --- CAMD/Lib/Makefile.orig      2011-12-08 18:36:42.000000000 +0100
  48 +++ CAMD/Lib/Makefile   2012-01-01 13:52:49.706230628 +0100
  49 @@ -8,9 +8,9 @@
  50
  51  default: everything
  52
  53 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  54 +include /usr/share/misc/SuiteSparse_config.mk
  55
  56 -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
  57 +C = $(CC) $(CF) -I../Include
  58
  59  everything:
  60         $(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o
  61 diff -ur CAMD/Makefile CAMD-uf/Makefile
  62 --- CAMD/Makefile       2007-05-05 19:23:47.000000000 +0200
  63 +++ CAMD-uf/Makefile    2007-12-02 18:02:33.000000000 +0100
  64 @@ -4,7 +4,7 @@
  65
  66  default: demo
  67
  68 -include ../SuiteSparse_config/SuiteSparse_config.mk
  69 +include /usr/share/misc/SuiteSparse_config.mk
  70
  71  # Compile all C code, including the C-callable routines.
  72  # Do not compile the FORTRAN versions, or MATLAB interface.
  73 --- CAMD/Lib/GNUmakefile.orig   2012-05-27 01:26:47.000000000 +0200
  74 +++ CAMD/Lib/GNUmakefile        2012-06-27 16:48:35.802145990 +0200
  75 @@ -4,9 +4,9 @@
  76
  77  default: libcamd.a
  78
  79 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  80 +include /usr/share/misc/SuiteSparse_config.mk
  81
  82 -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
  83 +C = $(CC) $(CF) -I../Include
  84
  85  #-------------------------------------------------------------------------------
  86  # source files
  87 @@ -15,8 +15,7 @@
  88  CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \
  89         camd_order camd_control camd_info camd_valid camd_preprocess
  90
  91 -INC = ../Include/camd.h ../Include/camd_internal.h \
  92 -      ../../SuiteSparse_config/SuiteSparse_config.h
  93 +INC = ../Include/camd.h ../Include/camd_internal.h
  94
  95  #-------------------------------------------------------------------------------
  96  # object files for each version