- updated to 2.7.2

[packages/COLAMD.git] / colamd-ufconfig.patch

diff --git a/colamd-ufconfig.patch b/colamd-ufconfig.patch
index 604a876d276484d244d30c6868306c058827b494..acc98e41ba57423cb142836b1394ae6afb0bb63e 100644 (file)
--- a/colamd-ufconfig.patch
+++ b/colamd-ufconfig.patch
@@ -9,8 +9,8 @@
  
  #ifdef DLONG
  
---- COLAMD/Source/colamd.h~    2006-12-13 13:46:09.000000000 +0200
-+++ COLAMD/Source/colamd.h     2007-03-27 01:18:06.598650636 +0300
+--- COLAMD/Include/colamd.h~   2006-12-13 13:46:09.000000000 +0200
++++ COLAMD/Include/colamd.h    2007-03-27 01:18:06.598650636 +0300
 @@ -139,7 +139,7 @@
  /* ========================================================================== */
  
@@ -20,8 +20,8 @@
  
  size_t colamd_recommended     /* returns recommended value of Alen, */
                                /* or 0 if input arguments are erroneous */
---- COLAMD/Source/colamd_l_example.c~  2006-12-13 13:47:22.000000000 +0200
-+++ COLAMD/Source/colamd_l_example.c   2007-03-27 01:18:17.698899095 +0300
+--- COLAMD/Demo/colamd_l_example.c~    2006-12-13 13:47:22.000000000 +0200
++++ COLAMD/Demo/colamd_l_example.c     2007-03-27 01:18:17.698899095 +0300
 @@ -44,7 +44,7 @@
  #define B_N 5
  
@@ -33,14 +33,63 @@
  {
 --- COLAMD/Makefile~   2007-03-27 01:18:43.219470348 +0300
 +++ COLAMD/Makefile    2007-03-27 01:18:44.569500568 +0300
-@@ -1,9 +1,7 @@
+@@ -1,7 +1,7 @@
  
- default: libcolamd.a colamd_example colamd_l_example
+ default: demo
  
 -include ../UFconfig/UFconfig.mk
--
--I = -I../UFconfig
 +include /usr/share/misc/UFconfig.mk
  
- colamd_example: colamd_example.c libcolamd.a
-       $(CC) $(CFLAGS) $(I) -o colamd_example colamd_example.c libcolamd.a -lm
+ # Compile all C code, including the C-callable routine and the mexFunctions.
+ # Do not the MATLAB interface.
+diff -ur COLAMD/Demo/Makefile COLAMD.UF/Demo/Makefile
+--- COLAMD/Demo/Makefile       2007-05-05 15:42:44.000000000 +0200
++++ COLAMD.UF/Demo/Makefile    2007-12-02 15:41:19.000000000 +0100
+@@ -4,9 +4,9 @@
+ 
+ default: colamd_example colamd_l_example
+ 
+-include ../../UFconfig/UFconfig.mk
++include /usr/share/misc/UFconfig.mk
+ 
+-I = -I../Include -I../../UFconfig
++I = -I../Include
+ 
+ C = $(CC) $(CFLAGS) $(I)
+ 
+diff -ur COLAMD/Lib/Makefile COLAMD.UF/Lib/Makefile
+--- COLAMD/Lib/Makefile        2007-05-05 15:41:47.000000000 +0200
++++ COLAMD.UF/Lib/Makefile     2007-12-02 15:42:02.000000000 +0100
+@@ -4,11 +4,11 @@
+ 
+ default: libcolamd.a
+ 
+-include ../../UFconfig/UFconfig.mk
++include /usr/share/misc/UFconfig.mk
+ 
+-I = -I../Include -I../../UFconfig
++I = -I../Include
+ 
+-INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
++INC = ../Include/colamd.h
+ 
+ SRC = ../Source/colamd.c ../Source/colamd_global.c
+ 
+diff -ur COLAMD/MATLAB/Makefile COLAMD.UF/MATLAB/Makefile
+--- COLAMD/MATLAB/Makefile     2007-05-06 04:41:53.000000000 +0200
++++ COLAMD.UF/MATLAB/Makefile  2007-12-02 15:42:15.000000000 +0100
+@@ -2,11 +2,11 @@
+ 
+ default: colamd2 symamd2
+ 
+-include ../../UFconfig/UFconfig.mk
++include /usr/share/misc/UFconfig.mk
+ 
+-I = -I../../UFconfig -I../Include
++I = -I../Include
+ 
+-INC = ../Include/colamd.h ../../UFconfig/UFconfig.h
++INC = ../Include/colamd.h
+ 
+ SRC = ../Source/colamd.c ../Source/colamd_global.c
+