-diff -ur AMD/Demo/amd_l_demo.c AMD-uf/Demo/amd_l_demo.c
---- AMD/Demo/amd_l_demo.c 2007-05-03 17:16:55.000000000 +0200
-+++ AMD-uf/Demo/amd_l_demo.c 2007-12-02 18:02:54.000000000 +0100
-@@ -16,7 +16,7 @@
- #include "amd.h"
- #include <stdio.h>
- #include <stdlib.h>
--#include "UFconfig.h"
-+#include <UFconfig.h>
-
- int main (void)
- {
-diff -ur AMD/Demo/Makefile AMD-uf/Demo/Makefile
---- AMD/Demo/Makefile 2007-05-05 16:25:26.000000000 +0200
-+++ AMD-uf/Demo/Makefile 2007-12-02 18:01:51.000000000 +0100
+--- AMD/Demo/Makefile.orig 2012-05-27 01:13:34.000000000 +0200
++++ AMD/Demo/Makefile 2012-06-27 15:15:08.539047966 +0200
@@ -4,11 +4,11 @@
default: amd_simple amd_demo amd_demo2 amd_l_demo
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
--C = $(CC) $(CFLAGS) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
++C = $(CC) $(CF) -I../Include
--INC = ../Include/amd.h ../../UFconfig/UFconfig.h
+-INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
+INC = ../Include/amd.h
library:
( cd ../Lib ; $(MAKE) )
-diff -ur AMD/Doc/Makefile AMD-uf/Doc/Makefile
---- AMD/Doc/Makefile 2006-04-25 18:34:27.000000000 +0200
-+++ AMD-uf/Doc/Makefile 2007-12-02 18:01:59.000000000 +0100
+--- AMD/Doc/Makefile.orig 2012-05-28 02:24:04.000000000 +0200
++++ AMD/Doc/Makefile 2012-06-27 15:15:47.109046348 +0200
@@ -4,7 +4,7 @@
default: dist
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
#------------------------------------------------------------------------------
# Remove all but the files in the original distribution
-diff -ur AMD/Include/amd.h AMD-uf/Include/amd.h
---- AMD/Include/amd.h 2007-05-04 17:11:54.000000000 +0200
-+++ AMD-uf/Include/amd.h 2007-12-02 18:03:19.000000000 +0100
-@@ -45,7 +45,7 @@
+--- AMD/Include/amd.h.orig 2012-05-29 18:42:50.000000000 +0200
++++ AMD/Include/amd.h 2012-06-27 15:12:34.369054437 +0200
+@@ -43,7 +43,7 @@
+ /* get the definition of size_t: */
#include <stddef.h>
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
- int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
- * AMD_INVALID, or AMD_OUT_OF_MEMORY */
-diff -ur AMD/Include/amd_internal.h AMD-uf/Include/amd_internal.h
---- AMD/Include/amd_internal.h 2007-05-03 17:26:14.000000000 +0200
-+++ AMD-uf/Include/amd_internal.h 2007-12-02 18:03:11.000000000 +0100
-@@ -162,7 +162,7 @@
- /* ------------------------------------------------------------------------- */
-
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
-
- #if defined (DLONG) || defined (ZLONG)
-
-diff -ur AMD/Lib/Makefile AMD-uf/Lib/Makefile
---- AMD/Lib/Makefile 2007-05-06 14:32:40.000000000 +0200
-+++ AMD-uf/Lib/Makefile 2007-12-02 18:02:11.000000000 +0100
+ int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
+ * AMD_INVALID, or AMD_OUT_OF_MEMORY */
+--- AMD/Lib/Makefile.orig 2012-05-27 01:19:39.000000000 +0200
++++ AMD/Lib/Makefile 2012-06-27 15:16:07.689045486 +0200
@@ -8,9 +8,9 @@
default: everything
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
--C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
++C = $(CC) $(CF) -I../Include
everything:
$(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
-diff -ur AMD/Makefile AMD-uf/Makefile
---- AMD/Makefile 2007-05-05 19:23:47.000000000 +0200
-+++ AMD-uf/Makefile 2007-12-02 18:02:33.000000000 +0100
-@@ -4,7 +4,7 @@
-
- default: demo
-
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+--- AMD/Makefile.orig 2012-05-28 22:30:07.000000000 +0200
++++ AMD/Makefile 2012-06-27 15:16:34.285711036 +0200
+@@ -6,7 +6,7 @@
- # Compile all C code, including the C-callable routines.
- # Do not compile the FORTRAN versions, or MATLAB interface.
-diff -ur AMD/MATLAB/amd_mex.c AMD-uf/MATLAB/amd_mex.c
---- AMD/MATLAB/amd_mex.c 2007-05-03 17:22:16.000000000 +0200
-+++ AMD-uf/MATLAB/amd_mex.c 2007-12-02 18:03:32.000000000 +0100
-@@ -30,7 +30,7 @@
- #include "amd.h"
- #include "mex.h"
- #include "matrix.h"
--#include "UFconfig.h"
-+#include <UFconfig.h>
+ default: all
- void mexFunction
- (
-diff -ur AMD/MATLAB/Makefile AMD-uf/MATLAB/Makefile
---- AMD/MATLAB/Makefile 2007-05-03 16:02:45.000000000 +0200
-+++ AMD-uf/MATLAB/Makefile 2007-12-02 18:02:24.000000000 +0100
-@@ -4,13 +4,13 @@
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
- default: amd2
-
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
-
- AMD = ../Lib/libamd.a
-
--I = -I../Include -I../../UFconfig
-+I = -I../Include
-
--INC = ../Include/amd.h ../Include/amd_internal.h ../../UFconfig/UFconfig.h
-+INC = ../Include/amd.h ../Include/amd_internal.h
+ demos: all
- SRC = ../Source/amd_1.c ../Source/amd_2.c ../Source/amd_aat.c \
- ../Source/amd_control.c ../Source/amd_defaults.c ../Source/amd_dump.c \
---- AMD/Lib/GNUmakefile~ 2007-05-06 14:32:19.000000000 +0200
-+++ AMD/Lib/GNUmakefile 2007-12-02 18:23:35.000000000 +0100
+--- AMD/Lib/GNUmakefile.orig 2012-05-29 23:56:26.000000000 +0200
++++ AMD/Lib/GNUmakefile 2012-06-27 15:20:21.892368141 +0200
@@ -4,9 +4,9 @@
- default: ../Lib/libamd.a
+ default: libamd.a
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
--C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
++C = $(CC) $(CF) -I../Include
#-------------------------------------------------------------------------------
# source files
AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
amd_order amd_control amd_info amd_valid amd_preprocess
--UFCONFIG = ../../UFconfig/UFconfig.h
+-CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
-
--INC = ../Include/amd.h ../Include/amd_internal.h $(UFCONFIG)
+-INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
+INC = ../Include/amd.h ../Include/amd_internal.h
#-------------------------------------------------------------------------------
projects / packages / AMD.git / blobdiff