1 --- UMFPACK/Demo/Makefile.orig 2011-12-14 18:45:15.000000000 +0100
2 +++ UMFPACK/Demo/Makefile 2012-01-06 08:03:34.253327243 +0100
5 all64: libs run hb fortran64
7 -include ../../UFconfig/UFconfig.mk
8 +include /usr/share/misc/UFconfig.mk
10 #-------------------------------------------------------------------------------
11 # the optional Partition module requires METIS, CAMD, and CCOLAMD
14 ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
15 # CHOLMOD is requested. See if it is available
16 - ifeq (../../CHOLMOD, $(wildcard ../../CHOLMOD))
17 - ifeq (../../COLAMD, $(wildcard ../../COLAMD))
18 + ifeq ($(WITH_CHOLMOD), 1)
19 + # assume COLAMD available
20 # CHOLMOD and COLAMD are available
22 - LIB_WITH_CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
23 - ../../COLAMD/Lib/libcolamd.a
24 + LIB_WITH_CHOLMOD = -lcholmod -lcolamd
25 # check if METIS is requested and available
26 ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
27 # METIS is requested. See if it is available
28 - ifeq ($(METIS), $(wildcard $(METIS)))
29 - ifeq (../../CAMD, $(wildcard ../../CAMD))
30 - ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
31 + ifeq ($(WITH_METIS), 1)
32 + # assume CAMD and CCOLAMD are available
34 - LIB_WITH_PARTITION = $(METIS) \
35 - ../../CCOLAMD/Lib/libccolamd.a \
36 - ../../CAMD/Lib/libcamd.a
39 + LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
45 #-------------------------------------------------------------------------------
47 C = $(CC) $(CF) $(UMFPACK_CONFIG) $(CONFIG1) $(CONFIG2) \
48 - -I../Include -I../../AMD/Include -I../../UFconfig
49 + -I../Include -I/usr/include/amd
51 -INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
52 +INC = ../Include/umfpack.h
54 LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
56 diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
57 --- UMFPACK/Doc/Makefile 2006-01-30 17:51:24.000000000 +0100
58 +++ UMFPACK-uf/Doc/Makefile 2007-12-02 19:19:00.000000000 +0100
63 -include ../../UFconfig/UFconfig.mk
64 +include /usr/share/misc/UFconfig.mk
66 #-------------------------------------------------------------------------------
67 # Remove all but the files in the original distribution
68 --- UMFPACK/Lib/GNUmakefile.orig 2011-12-08 19:48:30.000000000 +0100
69 +++ UMFPACK/Lib/GNUmakefile 2012-01-06 08:36:15.313392908 +0100
74 -include ../../UFconfig/UFconfig.mk
75 +include /usr/share/misc/UFconfig.mk
77 # UMFPACK can use CHOLMOD by default as an ordering option
78 ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
79 - I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
80 + I = -I../Include -I../Source -I/usr/include/amd
82 - I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
83 - -I../../CHOLMOD/Include
84 + I = -I../Include -I../Source -I/usr/include/amd \
85 + -I/usr/include/cholmod
88 C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
91 #-------------------------------------------------------------------------------
93 -INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
94 +INC = ../Include/umfpack.h \
95 ../Source/umf_config.h ../Source/umf_version.h \
96 ../Source/umf_internal.h ../Source/umf_triplet.h \
97 $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \
98 diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile
99 --- UMFPACK/Lib/Makefile 2007-05-05 21:50:23.000000000 +0200
100 +++ UMFPACK-uf/Lib/Makefile 2007-12-02 19:19:20.000000000 +0100
105 -include ../../UFconfig/UFconfig.mk
106 +include /usr/share/misc/UFconfig.mk
108 C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
110 diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
111 --- UMFPACK/Makefile 2007-10-30 23:03:55.000000000 +0100
112 +++ UMFPACK-uf/Makefile 2007-12-02 19:21:14.000000000 +0100
117 -include ../UFconfig/UFconfig.mk
118 +include /usr/share/misc/UFconfig.mk
120 # compile all C code (except hb, fortran, and fortran64), including AMD and the
121 # MATLAB mexFunctions
122 --- UMFPACK/MATLAB/Makefile.orig 2009-11-11 21:10:02.000000000 +0100
123 +++ UMFPACK/MATLAB/Makefile 2010-10-13 09:39:55.187740205 +0200
126 - echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction"
128 -include ../../UFconfig/UFconfig.mk
129 +include /usr/share/misc/UFconfig.mk
131 #-------------------------------------------------------------------------------
132 # Remove all but the files in the original distribution
133 diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile
134 --- UMFPACK/Tcov/Makefile 2006-12-01 13:47:48.000000000 +0100
135 +++ UMFPACK-uf/Tcov/Makefile 2007-12-02 19:21:03.000000000 +0100
138 -include ../../UFconfig/UFconfig.mk
139 +include /usr/share/misc/UFconfig.mk