UMFPACK-ufconfig.patch

   1 diff -ur UMFPACK/Demo/Makefile UMFPACK-uf/Demo/Makefile
   2 --- UMFPACK/Demo/Makefile       2007-05-05 21:56:55.000000000 +0200
   3 +++ UMFPACK-uf/Demo/Makefile    2007-12-02 19:18:50.000000000 +0100
   4 @@ -7,12 +7,11 @@
   5
   6  default: libs run
   7
   8 -include ../../UFconfig/UFconfig.mk
   9 +include /usr/share/misc/UFconfig.mk
  10
  11 -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
  12 -    -I../../UFconfig
  13 +C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include
  14
  15 -INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
  16 +INC = ../Include/umfpack.h ../../AMD/Include/amd.h
  17
  18  LIBS = $(BLAS) $(XERBLA) $(LIB)
  19
  20 Only in UMFPACK-uf/Demo: Makefile~
  21 diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
  22 --- UMFPACK/Doc/Makefile        2006-01-30 17:51:24.000000000 +0100
  23 +++ UMFPACK-uf/Doc/Makefile     2007-12-02 19:19:00.000000000 +0100
  24 @@ -7,7 +7,7 @@
  25
  26  default: dist
  27
  28 -include ../../UFconfig/UFconfig.mk
  29 +include /usr/share/misc/UFconfig.mk
  30
  31  #-------------------------------------------------------------------------------
  32  # Remove all but the files in the original distribution
  33 Only in UMFPACK-uf/Doc: Makefile~
  34 diff -ur UMFPACK/Lib/GNUmakefile UMFPACK-uf/Lib/GNUmakefile
  35 --- UMFPACK/Lib/GNUmakefile     2007-05-06 14:31:22.000000000 +0200
  36 +++ UMFPACK-uf/Lib/GNUmakefile  2007-12-02 19:20:09.000000000 +0100
  37 @@ -4,10 +4,10 @@
  38
  39  default: ../Lib/libumfpack.a
  40
  41 -include ../../UFconfig/UFconfig.mk
  42 +include /usr/share/misc/UFconfig.mk
  43
  44  C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
  45 -    -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
  46 +    -I../Include -I../Source -I../../AMD/Include
  47
  48  #-------------------------------------------------------------------------------
  49  # source files
  50 @@ -65,7 +65,7 @@
  51  # include files:
  52  #-------------------------------------------------------------------------------
  53
  54 -INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
  55 +INC = ../Include/umfpack.h \
  56         ../Source/umf_config.h ../Source/umf_version.h \
  57         ../Source/umf_internal.h ../Source/umf_triplet.h \
  58         $(addprefix ../Source/,  $(addsuffix .h,$(UMFCH))) \
  59 Only in UMFPACK-uf/Lib: GNUmakefile~
  60 diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile
  61 --- UMFPACK/Lib/Makefile        2007-05-05 21:50:23.000000000 +0200
  62 +++ UMFPACK-uf/Lib/Makefile     2007-12-02 19:19:20.000000000 +0100
  63 @@ -8,7 +8,7 @@
  64
  65  default: everything
  66
  67 -include ../../UFconfig/UFconfig.mk
  68 +include /usr/share/misc/UFconfig.mk
  69
  70  C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
  71      -I../Source
  72 Only in UMFPACK-uf/Lib: Makefile~
  73 diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
  74 --- UMFPACK/Makefile    2007-10-30 23:03:55.000000000 +0100
  75 +++ UMFPACK-uf/Makefile 2007-12-02 19:21:14.000000000 +0100
  76 @@ -6,7 +6,7 @@
  77
  78  default: library
  79
  80 -include ../UFconfig/UFconfig.mk
  81 +include /usr/share/misc/UFconfig.mk
  82
  83  # compile all C code (except hb, fortran, and fortran64), including AMD and the
  84  # MATLAB mexFunctions
  85 Only in UMFPACK-uf: Makefile~
  86 diff -ur UMFPACK/MATLAB/GNUmakefile UMFPACK-uf/MATLAB/GNUmakefile
  87 --- UMFPACK/MATLAB/GNUmakefile  2007-05-06 04:55:06.000000000 +0200
  88 +++ UMFPACK-uf/MATLAB/GNUmakefile       2007-12-02 19:20:41.000000000 +0100
  89 @@ -4,9 +4,9 @@
  90
  91  default: umfpack2 luflop
  92
  93 -include ../../UFconfig/UFconfig.mk
  94 +include /usr/share/misc/UFconfig.mk
  95
  96 -I =  -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
  97 +I =  -I../Include -I../Source -I../../AMD/Include
  98
  99  MX = $(MEX) $(I)
 100
 101 @@ -74,8 +74,7 @@
 102  # include files:
 103  #-------------------------------------------------------------------------------
 104
 105 -AMDH = ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h \
 106 -    ../../UFconfig/UFconfig.h
 107 +AMDH = ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h
 108
 109  INC1 = umf_config.h umf_version.h umf_internal.h umf_triplet.h
 110
 111 Only in UMFPACK-uf/MATLAB: GNUmakefile~
 112 diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile
 113 --- UMFPACK/Tcov/Makefile       2006-12-01 13:47:48.000000000 +0100
 114 +++ UMFPACK-uf/Tcov/Makefile    2007-12-02 19:21:03.000000000 +0100
 115 @@ -1,5 +1,5 @@
 116
 117 -include ../../UFconfig/UFconfig.mk
 118 +include /usr/share/misc/UFconfig.mk
 119
 120  linux: distclean
 121         ./DO.linux
 122 Only in UMFPACK-uf/Tcov: Makefile~