1 diff -ur CAMD/Demo/camd_l_demo.c CAMD-uf/Demo/camd_l_demo.c
2 --- CAMD/Demo/camd_l_demo.c 2007-05-03 17:16:55.000000000 +0200
3 +++ CAMD-uf/Demo/camd_l_demo.c 2007-12-02 18:02:54.000000000 +0100
13 diff -ur CAMD/Demo/Makefile CAMD-uf/Demo/Makefile
14 --- CAMD/Demo/Makefile 2007-05-05 16:25:26.000000000 +0200
15 +++ CAMD-uf/Demo/Makefile 2007-12-02 18:01:51.000000000 +0100
18 default: camd_simple camd_demo camd_demo2 camd_l_demo
20 -include ../../UFconfig/UFconfig.mk
21 +include /usr/share/misc/UFconfig.mk
23 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
24 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
26 -UFCONFIG = ../../UFconfig/UFconfig.h
27 +UFCONFIG = /usr/share/misc/UFconfig.mk
29 -INC = ../Include/camd.h $(UFCONFIG)
30 +INC = ../Include/camd.h
33 ( cd ../Lib ; $(MAKE) )
34 diff -ur CAMD/Doc/Makefile CAMD-uf/Doc/Makefile
35 --- CAMD/Doc/Makefile 2006-04-25 18:34:27.000000000 +0200
36 +++ CAMD-uf/Doc/Makefile 2007-12-02 18:01:59.000000000 +0100
41 -include ../../UFconfig/UFconfig.mk
42 +include /usr/share/misc/UFconfig.mk
44 #------------------------------------------------------------------------------
45 # Remove all but the files in the original distribution
46 diff -ur CAMD/Include/camd.h CAMD-uf/Include/camd.h
47 --- CAMD/Include/camd.h 2007-05-04 17:11:54.000000000 +0200
48 +++ CAMD-uf/Include/camd.h 2007-12-02 18:03:19.000000000 +0100
53 -#include "UFconfig.h"
54 +#include <UFconfig.h>
56 int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED,
57 * AMD_INVALID, or AMD_OUT_OF_MEMORY */
58 diff -ur CAMD/Include/camd_internal.h CAMD-uf/Include/camd_internal.h
59 --- CAMD/Include/camd_internal.h 2007-05-03 17:26:14.000000000 +0200
60 +++ CAMD-uf/Include/camd_internal.h 2007-12-02 18:03:11.000000000 +0100
62 /* ------------------------------------------------------------------------- */
65 -#include "UFconfig.h"
66 +#include <UFconfig.h>
68 #if defined (DLONG) || defined (ZLONG)
70 diff -ur CAMD/Lib/Makefile CAMD-uf/Lib/Makefile
71 --- CAMD/Lib/Makefile 2007-05-06 14:32:40.000000000 +0200
72 +++ CAMD-uf/Lib/Makefile 2007-12-02 18:02:11.000000000 +0100
77 -include ../../UFconfig/UFconfig.mk
78 +include /usr/share/misc/UFconfig.mk
80 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
81 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
84 $(C) -DDINT -c ../Source/camd_aat.c -o camd_i_aat.o
85 diff -ur CAMD/Makefile CAMD-uf/Makefile
86 --- CAMD/Makefile 2007-05-05 19:23:47.000000000 +0200
87 +++ CAMD-uf/Makefile 2007-12-02 18:02:33.000000000 +0100
92 -include ../UFconfig/UFconfig.mk
93 +include /usr/share/misc/UFconfig.mk
95 # Compile all C code, including the C-callable routines.
96 # Do not compile the FORTRAN versions, or MATLAB interface.
97 diff -ur CAMD/MATLAB/camd_mex.c CAMD-uf/MATLAB/camd_mex.c
98 --- CAMD/MATLAB/camd_mex.c 2007-05-03 17:22:16.000000000 +0200
99 +++ CAMD-uf/MATLAB/camd_mex.c 2007-12-02 18:03:32.000000000 +0100
104 -#include "UFconfig.h"
105 +#include <UFconfig.h>
109 diff -ur CAMD/MATLAB/Makefile CAMD-uf/MATLAB/Makefile
110 --- CAMD/MATLAB/Makefile 2007-05-03 16:02:45.000000000 +0200
111 +++ CAMD-uf/MATLAB/Makefile 2007-12-02 18:02:24.000000000 +0100
116 -include ../../UFconfig/UFconfig.mk
117 +include /usr/share/misc/UFconfig.mk
119 CAMD = ../Lib/libcamd.a
121 -I = -I../Include -I../../UFconfig
124 -INC = ../Include/camd.h ../Include/camd_internal.h ../../UFconfig/UFconfig.h
125 +INC = ../Include/camd.h ../Include/camd_internal.h
127 SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \
128 ../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \
129 --- CAMD/Lib/GNUmakefile~ 2007-05-06 14:32:19.000000000 +0200
130 +++ CAMD/Lib/GNUmakefile 2007-12-02 18:23:35.000000000 +0100
133 default: ../Lib/libamd.a
135 -include ../../UFconfig/UFconfig.mk
136 +include /usr/share/misc/UFconfig.mk
138 -C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
139 +C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
141 #-------------------------------------------------------------------------------
144 CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_post_tree camd_defaults \
145 camd_order camd_control camd_info camd_valid camd_preprocess
147 -UFCONFIG = ../../UFconfig/UFconfig.h
149 -INC = ../Include/camd.h ../Include/camd_internal.h $(UFCONFIG)
150 +INC = ../Include/camd.h ../Include/camd_internal.h
152 #-------------------------------------------------------------------------------
153 # object files for each version