]>
Commit | Line | Data |
---|---|---|
52e53b91 JB |
1 | --- AMD/Demo/Makefile.orig 2012-05-27 01:13:34.000000000 +0200 |
2 | +++ AMD/Demo/Makefile 2012-06-27 15:15:08.539047966 +0200 | |
3a1b63e2 JR |
3 | @@ -4,11 +4,11 @@ |
4 | ||
5 | default: amd_simple amd_demo amd_demo2 amd_l_demo | |
6 | ||
52e53b91 JB |
7 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
8 | +include /usr/share/misc/SuiteSparse_config.mk | |
3a1b63e2 | 9 | |
52e53b91 | 10 | -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config |
0df8ae65 | 11 | +C = $(CC) $(CF) -I../Include |
3a1b63e2 | 12 | |
52e53b91 | 13 | -INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h |
3a1b63e2 JR |
14 | +INC = ../Include/amd.h |
15 | ||
16 | library: | |
17 | ( cd ../Lib ; $(MAKE) ) | |
52e53b91 JB |
18 | --- AMD/Doc/Makefile.orig 2012-05-28 02:24:04.000000000 +0200 |
19 | +++ AMD/Doc/Makefile 2012-06-27 15:15:47.109046348 +0200 | |
3a1b63e2 JR |
20 | @@ -4,7 +4,7 @@ |
21 | ||
22 | default: dist | |
23 | ||
52e53b91 JB |
24 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
25 | +include /usr/share/misc/SuiteSparse_config.mk | |
3a1b63e2 JR |
26 | |
27 | #------------------------------------------------------------------------------ | |
28 | # Remove all but the files in the original distribution | |
52e53b91 JB |
29 | --- AMD/Include/amd.h.orig 2012-05-29 18:42:50.000000000 +0200 |
30 | +++ AMD/Include/amd.h 2012-06-27 15:12:34.369054437 +0200 | |
31 | @@ -43,7 +43,7 @@ | |
32 | /* get the definition of size_t: */ | |
3a1b63e2 JR |
33 | #include <stddef.h> |
34 | ||
52e53b91 JB |
35 | -#include "SuiteSparse_config.h" |
36 | +#include <SuiteSparse_config.h> | |
3a1b63e2 | 37 | |
52e53b91 JB |
38 | int amd_order /* returns AMD_OK, AMD_OK_BUT_JUMBLED, |
39 | * AMD_INVALID, or AMD_OUT_OF_MEMORY */ | |
40 | --- AMD/Lib/Makefile.orig 2012-05-27 01:19:39.000000000 +0200 | |
41 | +++ AMD/Lib/Makefile 2012-06-27 15:16:07.689045486 +0200 | |
3a1b63e2 JR |
42 | @@ -8,9 +8,9 @@ |
43 | ||
44 | default: everything | |
45 | ||
52e53b91 JB |
46 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
47 | +include /usr/share/misc/SuiteSparse_config.mk | |
3a1b63e2 | 48 | |
52e53b91 | 49 | -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config |
0df8ae65 | 50 | +C = $(CC) $(CF) -I../Include |
3a1b63e2 JR |
51 | |
52 | everything: | |
53 | $(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o | |
52e53b91 JB |
54 | --- AMD/Makefile.orig 2012-05-28 22:30:07.000000000 +0200 |
55 | +++ AMD/Makefile 2012-06-27 15:16:34.285711036 +0200 | |
56 | @@ -6,7 +6,7 @@ | |
3a1b63e2 | 57 | |
52e53b91 | 58 | default: all |
3a1b63e2 | 59 | |
52e53b91 JB |
60 | -include ../SuiteSparse_config/SuiteSparse_config.mk |
61 | +include /usr/share/misc/SuiteSparse_config.mk | |
3a1b63e2 | 62 | |
52e53b91 | 63 | demos: all |
3a1b63e2 | 64 | |
52e53b91 JB |
65 | --- AMD/Lib/GNUmakefile.orig 2012-05-29 23:56:26.000000000 +0200 |
66 | +++ AMD/Lib/GNUmakefile 2012-06-27 15:20:21.892368141 +0200 | |
3a1b63e2 JR |
67 | @@ -4,9 +4,9 @@ |
68 | ||
0df8ae65 | 69 | default: libamd.a |
3a1b63e2 | 70 | |
52e53b91 JB |
71 | -include ../../SuiteSparse_config/SuiteSparse_config.mk |
72 | +include /usr/share/misc/SuiteSparse_config.mk | |
3a1b63e2 | 73 | |
52e53b91 | 74 | -C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config |
0df8ae65 | 75 | +C = $(CC) $(CF) -I../Include |
3a1b63e2 JR |
76 | |
77 | #------------------------------------------------------------------------------- | |
78 | # source files | |
52e53b91 | 79 | @@ -15,9 +15,7 @@ |
3a1b63e2 JR |
80 | AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \ |
81 | amd_order amd_control amd_info amd_valid amd_preprocess | |
82 | ||
52e53b91 | 83 | -CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h |
3a1b63e2 | 84 | - |
52e53b91 | 85 | -INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG) |
3a1b63e2 JR |
86 | +INC = ../Include/amd.h ../Include/amd_internal.h |
87 | ||
88 | #------------------------------------------------------------------------------- | |
89 | # object files for each version |