Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lis/files/
Date: Sun, 29 Jan 2017 20:11:27
Message-Id: 1485720578.22157b49a22b02e7b1198b35ed975a73ddaa1e15.soap@gentoo
1 commit: 22157b49a22b02e7b1198b35ed975a73ddaa1e15
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 29 09:10:29 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 20:09:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22157b49
7
8 sci-libs/lis: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3709
11
12 sci-libs/lis/files/lis-1.4.11-autotools.patch | 311 --------------------------
13 sci-libs/lis/files/lis-1.4.23-autotools.patch | 302 -------------------------
14 2 files changed, 613 deletions(-)
15
16 diff --git a/sci-libs/lis/files/lis-1.4.11-autotools.patch b/sci-libs/lis/files/lis-1.4.11-autotools.patch
17 deleted file mode 100644
18 index a717bc8..00000000
19 --- a/sci-libs/lis/files/lis-1.4.11-autotools.patch
20 +++ /dev/null
21 @@ -1,311 +0,0 @@
22 -Patch to the lis-1.4.11 autotools build system.
23 -* use autoconf macros to propagate fortran/c link flags instead of custom build ones
24 -* propagate properly CPPFLAGS instead of CFLAGS
25 -* remove custom built linking commands
26 -* use the target check for testing and
27 -* default install only installs the library, not the tests
28 -
29 -bicatali@g.o
30 -
31 -diff -Nur lis-1.4.11.orig/configure.in lis-1.4.11/configure.in
32 ---- lis-1.4.11.orig/configure.in 2013-07-22 09:38:36.726745408 -0700
33 -+++ lis-1.4.11/configure.in 2013-07-22 13:20:55.976919675 -0700
34 -@@ -526,6 +526,8 @@
35 - fi
36 - AC_LANG_PUSH(Fortran 77)
37 - AC_PROG_F77([ifort ifc efc xlf95_r xlf90_r xlf_r xlf95 xlf90 xlf ftn frt pgf95 pgf90 pathf95 pathf90 epcf90 f95 fort lf95 gfortran f90 g77])
38 -+ AC_F77_LIBRARY_LDFLAGS
39 -+ AC_F77_DUMMY_MAIN
40 - if test "$TARGET" = ""; then
41 - if test "$enable_mpi" = "yes"; then
42 - AC_CHECK_PROGS(MPIF77, mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpifrt cmpifc cmpif90c mpf90 mpif90 hf77 mpxlf_r mpxlf mpf77 mpif77, $F77)
43 -diff -Nur lis-1.4.11.orig/src/esolver/Makefile.am lis-1.4.11/src/esolver/Makefile.am
44 ---- lis-1.4.11.orig/src/esolver/Makefile.am 2013-07-22 09:38:36.738745738 -0700
45 -+++ lis-1.4.11/src/esolver/Makefile.am 2013-07-22 10:12:47.008883688 -0700
46 -@@ -8,16 +8,5 @@
47 - lis_esolver_si.c \
48 - lis_esolver_rqi.c
49 -
50 --AM_CFLAGS = -I$(top_srcdir)/include
51 -+AM_CPPFLAGS = -I$(top_srcdir)/include
52 - CLEANFILES = *.il
53 --
54 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
55 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
56 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
57 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
58 -- $(AM_FFLAGS) $(FFLAGS)
59 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
60 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
61 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
62 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
63 -- $(AM_CFLAGS) $(CFLAGS)
64 -diff -Nur lis-1.4.11.orig/src/fortran/amg/Makefile.am lis-1.4.11/src/fortran/amg/Makefile.am
65 ---- lis-1.4.11.orig/src/fortran/amg/Makefile.am 2013-07-22 09:38:36.736745697 -0700
66 -+++ lis-1.4.11/src/fortran/amg/Makefile.am 2013-07-22 10:13:24.842091465 -0700
67 -@@ -25,25 +25,6 @@
68 -
69 - CLEANFILES = *.mod
70 - AM_CPPFLAGS = -I$(top_srcdir)/include
71 --FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
72 --LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
73 --FCLD = $(FC)
74 --FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@
75 --PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
76 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
77 --LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \
78 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
79 -- $(AM_FCFLAGS) $(FCFLAGS)
80 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
81 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
82 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
83 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
84 -- $(AM_FFLAGS) $(FFLAGS)
85 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
86 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
87 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
88 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
89 -- $(AM_CFLAGS) $(CFLAGS)
90 -
91 - .NOTPARALLEL:
92 - .NO_PARALLEL:
93 -diff -Nur lis-1.4.11.orig/src/fortran/Makefile.am lis-1.4.11/src/fortran/Makefile.am
94 ---- lis-1.4.11.orig/src/fortran/Makefile.am 2013-07-22 09:38:36.737745719 -0700
95 -+++ lis-1.4.11/src/fortran/Makefile.am 2013-07-22 10:13:42.419187912 -0700
96 -@@ -9,14 +9,3 @@
97 -
98 - AM_CPPFLAGS = -I$(top_srcdir)/include
99 - CLEANFILES = *.il
100 --
101 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
102 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
103 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
104 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
105 -- $(AM_FFLAGS) $(FFLAGS)
106 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
107 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
108 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
109 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
110 -- $(AM_CFLAGS) $(CFLAGS)
111 -diff -Nur lis-1.4.11.orig/src/Makefile.am lis-1.4.11/src/Makefile.am
112 ---- lis-1.4.11.orig/src/Makefile.am 2013-07-22 09:38:36.738745738 -0700
113 -+++ lis-1.4.11/src/Makefile.am 2013-07-22 13:29:41.603990154 -0700
114 -@@ -22,7 +22,7 @@
115 - liblis@LIBSUFFIX@_la_LIBADD += fortran/amg/libsaamg.la
116 - else
117 - if ENABLE_FORTRAN
118 -- liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la
119 -+ liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS)
120 - endif
121 - endif
122 - liblis@LIBSUFFIX@_la_SOURCES =
123 -diff -Nur lis-1.4.11.orig/src/matrix/Makefile.am lis-1.4.11/src/matrix/Makefile.am
124 ---- lis-1.4.11.orig/src/matrix/Makefile.am 2013-07-22 09:38:36.739745755 -0700
125 -+++ lis-1.4.11/src/matrix/Makefile.am 2013-07-22 10:14:14.321363119 -0700
126 -@@ -18,16 +18,5 @@
127 - lis_matrix_rco.c \
128 - lis_matrix_vbr.c
129 -
130 --AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS)
131 -+AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS)
132 - CLEANFILES = *.il
133 --
134 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
135 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
136 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
137 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
138 -- $(AM_FFLAGS) $(FFLAGS)
139 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
140 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
141 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
142 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
143 -- $(AM_CFLAGS) $(CFLAGS)
144 -diff -Nur lis-1.4.11.orig/src/matvec/Makefile.am lis-1.4.11/src/matvec/Makefile.am
145 ---- lis-1.4.11.orig/src/matvec/Makefile.am 2013-07-22 09:38:36.735745673 -0700
146 -+++ lis-1.4.11/src/matvec/Makefile.am 2013-07-22 10:14:33.697469686 -0700
147 -@@ -13,16 +13,5 @@
148 - lis_matvec_vbr.c
149 -
150 -
151 --AM_CFLAGS = -I$(top_srcdir)/include
152 -+AM_CPPFLAGS = -I$(top_srcdir)/include
153 - CLEANFILES = *.il
154 --
155 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
156 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
157 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
158 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
159 -- $(AM_FFLAGS) $(FFLAGS)
160 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
161 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
162 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
163 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
164 -- $(AM_CFLAGS) $(CFLAGS)
165 -diff -Nur lis-1.4.11.orig/src/precision/Makefile.am lis-1.4.11/src/precision/Makefile.am
166 ---- lis-1.4.11.orig/src/precision/Makefile.am 2013-07-22 09:38:36.735745673 -0700
167 -+++ lis-1.4.11/src/precision/Makefile.am 2013-07-22 10:14:57.337599884 -0700
168 -@@ -4,16 +4,5 @@
169 - lis_precision_matvec.c
170 -
171 -
172 --AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG)
173 -+AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG)
174 - CLEANFILES = *.il
175 --
176 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
177 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
178 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
179 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
180 -- $(AM_FFLAGS) $(FFLAGS)
181 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
182 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
183 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
184 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
185 -- $(AM_CFLAGS) $(CFLAGS)
186 -diff -Nur lis-1.4.11.orig/src/precon/Makefile.am lis-1.4.11/src/precon/Makefile.am
187 ---- lis-1.4.11.orig/src/precon/Makefile.am 2013-07-22 09:38:36.735745673 -0700
188 -+++ lis-1.4.11/src/precon/Makefile.am 2013-07-22 10:15:16.666706135 -0700
189 -@@ -12,16 +12,5 @@
190 - lis_precon_ssor.c
191 -
192 -
193 --AM_CFLAGS = -I$(top_srcdir)/include
194 -+AM_CPPFLAGS = -I$(top_srcdir)/include
195 - CLEANFILES = *.il
196 --
197 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
198 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
199 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
200 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
201 -- $(AM_FFLAGS) $(FFLAGS)
202 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
203 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
204 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
205 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
206 -- $(AM_CFLAGS) $(CFLAGS)
207 -diff -Nur lis-1.4.11.orig/src/solver/Makefile.am lis-1.4.11/src/solver/Makefile.am
208 ---- lis-1.4.11.orig/src/solver/Makefile.am 2013-07-22 09:38:36.737745719 -0700
209 -+++ lis-1.4.11/src/solver/Makefile.am 2013-07-22 10:16:22.575071068 -0700
210 -@@ -17,16 +17,5 @@
211 - lis_solver_sor.c
212 -
213 -
214 --AM_CFLAGS = -I$(top_srcdir)/include
215 -+AM_CPPFLAGS = -I$(top_srcdir)/include
216 - CLEANFILES = *.il
217 --
218 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
219 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
220 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
221 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
222 -- $(AM_FFLAGS) $(FFLAGS)
223 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
224 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
225 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
226 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
227 -- $(AM_CFLAGS) $(CFLAGS)
228 -diff -Nur lis-1.4.11.orig/src/system/Makefile.am lis-1.4.11/src/system/Makefile.am
229 ---- lis-1.4.11.orig/src/system/Makefile.am 2013-07-22 09:38:36.734745646 -0700
230 -+++ lis-1.4.11/src/system/Makefile.am 2013-07-22 10:16:39.329163621 -0700
231 -@@ -13,16 +13,5 @@
232 - mt19937ar.c
233 -
234 -
235 --AM_CFLAGS = -I$(top_srcdir)/include
236 -+AM_CPPFLAGS = -I$(top_srcdir)/include
237 - CLEANFILES = *.il
238 --
239 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
240 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
241 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
242 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
243 -- $(AM_FFLAGS) $(FFLAGS)
244 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
245 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
246 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
247 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
248 -- $(AM_CFLAGS) $(CFLAGS)
249 -diff -Nur lis-1.4.11.orig/src/vector/Makefile.am lis-1.4.11/src/vector/Makefile.am
250 ---- lis-1.4.11.orig/src/vector/Makefile.am 2013-07-22 09:38:36.737745719 -0700
251 -+++ lis-1.4.11/src/vector/Makefile.am 2013-07-22 10:17:03.722298537 -0700
252 -@@ -4,16 +4,5 @@
253 - lis_vector_opv.c
254 -
255 -
256 --AM_CFLAGS = -I$(top_srcdir)/include
257 -+AM_CPPFLAGS = -I$(top_srcdir)/include
258 - CLEANFILES = *.il
259 --
260 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
261 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
262 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
263 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
264 -- $(AM_FFLAGS) $(FFLAGS)
265 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
266 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
267 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
268 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
269 -- $(AM_CFLAGS) $(CFLAGS)
270 -diff -Nur lis-1.4.11.orig/test/Makefile.am lis-1.4.11/test/Makefile.am
271 ---- lis-1.4.11.orig/test/Makefile.am 2013-07-22 09:38:36.727745436 -0700
272 -+++ lis-1.4.11/test/Makefile.am 2013-07-22 13:31:44.602704495 -0700
273 -@@ -5,15 +5,16 @@
274 -
275 - EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx
276 -
277 --testdir = ${prefix}/share/examples/lis
278 -+testdir = $(libdir)/lis/examples
279 -
280 - test_DATA = testmat.mtx testmat2.mtx
281 -
282 - test_SCRIPTS = defs test.sh
283 -
284 --test_PROGRAMS = test1 test2 test3 test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
285 -+check_PROGRAMS = test1 test2 test3 test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
286 - if ENABLE_FORTRAN
287 -- test_PROGRAMS += test1f test4f etest1f etest4f
288 -+ check_PROGRAMS += test1f test4f etest1f etest4f
289 -+ LDADD += $(FLIBS)
290 - endif
291 -
292 - test1_SOURCES = test1.c
293 -@@ -40,38 +41,11 @@
294 - etest4f_SOURCES = etest4f.F
295 - endif
296 -
297 --bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
298 -+noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest3 spmvtest4 spmvtest5
299 -
300 - lsolve_SOURCES = test1.c
301 - esolve_SOURCES = etest5.c
302 -
303 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
304 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
305 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
306 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
307 -- $(AM_FFLAGS) $(FFLAGS)
308 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
309 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
310 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
311 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
312 -- $(AM_CFLAGS) $(CFLAGS)
313 --
314 --if ENABLE_SAAMG
315 -- LINK = $(LIBTOOL) --mode=link $(FC) \
316 -- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
317 -- F77LINK = $(LIBTOOL) --mode=link $(FC) \
318 -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
319 --else
320 --if ENABLE_FORTRAN
321 -- LINK = $(LIBTOOL) --mode=link $(FC) \
322 -- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
323 -- F77LINK = $(LIBTOOL) --mode=link $(F77) \
324 -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
325 --else
326 -- LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS)
327 --endif
328 --endif
329 --
330 - CLEANFILES = *.il
331 -
332 -
333
334 diff --git a/sci-libs/lis/files/lis-1.4.23-autotools.patch b/sci-libs/lis/files/lis-1.4.23-autotools.patch
335 deleted file mode 100644
336 index e0da6a6..00000000
337 --- a/sci-libs/lis/files/lis-1.4.23-autotools.patch
338 +++ /dev/null
339 @@ -1,302 +0,0 @@
340 -diff -Nur lis-1.4.23.orig/configure.in lis-1.4.23/configure.in
341 ---- lis-1.4.23.orig/configure.in 2014-01-14 21:30:01.358264593 -0800
342 -+++ lis-1.4.23/configure.in 2014-01-14 21:31:19.917763200 -0800
343 -@@ -527,6 +527,8 @@
344 - AC_LANG_PUSH(Fortran 77)
345 - fflags_save="$FFLAGS"
346 - AC_PROG_F77([ifort ifc efc xlf95_r xlf90_r xlf_r xlf95 xlf90 xlf ftn frt pgf95 pgf90 pathf95 pathf90 epcf90 f95 fort lf95 gfortran f90 g77])
347 -+ AC_F77_LIBRARY_LDFLAGS
348 -+ AC_F77_DUMMY_MAIN
349 - FFLAGS="$fflags_save"
350 - if test "$TARGET" = ""; then
351 - if test "$enable_mpi" = "yes"; then
352 -diff -Nur lis-1.4.23.orig/src/Makefile.am lis-1.4.23/src/Makefile.am
353 ---- lis-1.4.23.orig/src/Makefile.am 2014-01-14 21:30:01.374264719 -0800
354 -+++ lis-1.4.23/src/Makefile.am 2014-01-14 21:30:25.932420643 -0800
355 -@@ -22,7 +22,7 @@
356 - liblis@LIBSUFFIX@_la_LIBADD += fortran/amg/libsaamg.la
357 - else
358 - if ENABLE_FORTRAN
359 -- liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la
360 -+ liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS)
361 - endif
362 - endif
363 - liblis@LIBSUFFIX@_la_SOURCES =
364 -diff -Nur lis-1.4.23.orig/src/esolver/Makefile.am lis-1.4.23/src/esolver/Makefile.am
365 ---- lis-1.4.23.orig/src/esolver/Makefile.am 2014-01-14 21:30:01.374264719 -0800
366 -+++ lis-1.4.23/src/esolver/Makefile.am 2014-01-14 21:30:25.931420647 -0800
367 -@@ -8,16 +8,5 @@
368 - lis_esolver_si.c \
369 - lis_esolver_rqi.c
370 -
371 --AM_CFLAGS = -I$(top_srcdir)/include
372 -+AM_CPPFLAGS = -I$(top_srcdir)/include
373 - CLEANFILES = *.il
374 --
375 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
376 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
377 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
378 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
379 -- $(AM_FFLAGS) $(FFLAGS)
380 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
381 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
382 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
383 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
384 -- $(AM_CFLAGS) $(CFLAGS)
385 -diff -Nur lis-1.4.23.orig/src/fortran/Makefile.am lis-1.4.23/src/fortran/Makefile.am
386 ---- lis-1.4.23.orig/src/fortran/Makefile.am 2014-01-14 21:30:01.373264712 -0800
387 -+++ lis-1.4.23/src/fortran/Makefile.am 2014-01-14 21:30:25.932420643 -0800
388 -@@ -9,14 +9,3 @@
389 -
390 - AM_CPPFLAGS = -I$(top_srcdir)/include
391 - CLEANFILES = *.il
392 --
393 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
394 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
395 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
396 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
397 -- $(AM_FFLAGS) $(FFLAGS)
398 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
399 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
400 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
401 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
402 -- $(AM_CFLAGS) $(CFLAGS)
403 -diff -Nur lis-1.4.23.orig/src/fortran/amg/Makefile.am lis-1.4.23/src/fortran/amg/Makefile.am
404 ---- lis-1.4.23.orig/src/fortran/amg/Makefile.am 2014-01-14 21:30:01.372264705 -0800
405 -+++ lis-1.4.23/src/fortran/amg/Makefile.am 2014-01-14 21:30:25.931420647 -0800
406 -@@ -25,25 +25,6 @@
407 -
408 - CLEANFILES = *.mod
409 - AM_CPPFLAGS = -I$(top_srcdir)/include
410 --FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
411 --LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
412 --FCLD = $(FC)
413 --FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@
414 --PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
415 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
416 --LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \
417 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
418 -- $(AM_FCFLAGS) $(FCFLAGS)
419 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
420 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
421 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
422 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
423 -- $(AM_FFLAGS) $(FFLAGS)
424 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
425 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
426 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
427 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
428 -- $(AM_CFLAGS) $(CFLAGS)
429 -
430 - .NOTPARALLEL:
431 - .NO_PARALLEL:
432 -diff -Nur lis-1.4.23.orig/src/matrix/Makefile.am lis-1.4.23/src/matrix/Makefile.am
433 ---- lis-1.4.23.orig/src/matrix/Makefile.am 2014-01-14 21:30:01.374264719 -0800
434 -+++ lis-1.4.23/src/matrix/Makefile.am 2014-01-14 21:30:25.932420643 -0800
435 -@@ -18,16 +18,5 @@
436 - lis_matrix_rco.c \
437 - lis_matrix_vbr.c
438 -
439 --AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS)
440 -+AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS)
441 - CLEANFILES = *.il
442 --
443 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
444 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
445 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
446 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
447 -- $(AM_FFLAGS) $(FFLAGS)
448 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
449 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
450 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
451 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
452 -- $(AM_CFLAGS) $(CFLAGS)
453 -diff -Nur lis-1.4.23.orig/src/matvec/Makefile.am lis-1.4.23/src/matvec/Makefile.am
454 ---- lis-1.4.23.orig/src/matvec/Makefile.am 2014-01-14 21:30:01.372264705 -0800
455 -+++ lis-1.4.23/src/matvec/Makefile.am 2014-01-14 21:30:25.932420643 -0800
456 -@@ -13,16 +13,5 @@
457 - lis_matvec_vbr.c
458 -
459 -
460 --AM_CFLAGS = -I$(top_srcdir)/include
461 -+AM_CPPFLAGS = -I$(top_srcdir)/include
462 - CLEANFILES = *.il
463 --
464 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
465 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
466 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
467 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
468 -- $(AM_FFLAGS) $(FFLAGS)
469 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
470 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
471 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
472 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
473 -- $(AM_CFLAGS) $(CFLAGS)
474 -diff -Nur lis-1.4.23.orig/src/precision/Makefile.am lis-1.4.23/src/precision/Makefile.am
475 ---- lis-1.4.23.orig/src/precision/Makefile.am 2014-01-14 21:30:01.372264705 -0800
476 -+++ lis-1.4.23/src/precision/Makefile.am 2014-01-14 21:30:25.932420643 -0800
477 -@@ -4,16 +4,5 @@
478 - lis_precision_matvec.c
479 -
480 -
481 --AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG)
482 -+AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG)
483 - CLEANFILES = *.il
484 --
485 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
486 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
487 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
488 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
489 -- $(AM_FFLAGS) $(FFLAGS)
490 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
491 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
492 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
493 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
494 -- $(AM_CFLAGS) $(CFLAGS)
495 -diff -Nur lis-1.4.23.orig/src/precon/Makefile.am lis-1.4.23/src/precon/Makefile.am
496 ---- lis-1.4.23.orig/src/precon/Makefile.am 2014-01-14 21:30:01.371264698 -0800
497 -+++ lis-1.4.23/src/precon/Makefile.am 2014-01-14 21:30:25.932420643 -0800
498 -@@ -12,16 +12,5 @@
499 - lis_precon_ssor.c
500 -
501 -
502 --AM_CFLAGS = -I$(top_srcdir)/include
503 -+AM_CPPFLAGS = -I$(top_srcdir)/include
504 - CLEANFILES = *.il
505 --
506 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
507 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
508 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
509 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
510 -- $(AM_FFLAGS) $(FFLAGS)
511 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
512 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
513 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
514 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
515 -- $(AM_CFLAGS) $(CFLAGS)
516 -diff -Nur lis-1.4.23.orig/src/solver/Makefile.am lis-1.4.23/src/solver/Makefile.am
517 ---- lis-1.4.23.orig/src/solver/Makefile.am 2014-01-14 21:30:01.373264712 -0800
518 -+++ lis-1.4.23/src/solver/Makefile.am 2014-01-14 21:30:25.932420643 -0800
519 -@@ -17,16 +17,5 @@
520 - lis_solver_sor.c
521 -
522 -
523 --AM_CFLAGS = -I$(top_srcdir)/include
524 -+AM_CPPFLAGS = -I$(top_srcdir)/include
525 - CLEANFILES = *.il
526 --
527 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
528 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
529 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
530 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
531 -- $(AM_FFLAGS) $(FFLAGS)
532 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
533 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
534 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
535 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
536 -- $(AM_CFLAGS) $(CFLAGS)
537 -diff -Nur lis-1.4.23.orig/src/system/Makefile.am lis-1.4.23/src/system/Makefile.am
538 ---- lis-1.4.23.orig/src/system/Makefile.am 2014-01-14 21:30:01.371264698 -0800
539 -+++ lis-1.4.23/src/system/Makefile.am 2014-01-14 21:30:25.932420643 -0800
540 -@@ -13,16 +13,5 @@
541 - mt19937ar.c
542 -
543 -
544 --AM_CFLAGS = -I$(top_srcdir)/include
545 -+AM_CPPFLAGS = -I$(top_srcdir)/include
546 - CLEANFILES = *.il
547 --
548 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
549 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
550 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
551 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
552 -- $(AM_FFLAGS) $(FFLAGS)
553 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
554 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
555 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
556 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
557 -- $(AM_CFLAGS) $(CFLAGS)
558 -diff -Nur lis-1.4.23.orig/src/vector/Makefile.am lis-1.4.23/src/vector/Makefile.am
559 ---- lis-1.4.23.orig/src/vector/Makefile.am 2014-01-14 21:30:01.373264712 -0800
560 -+++ lis-1.4.23/src/vector/Makefile.am 2014-01-14 21:30:25.932420643 -0800
561 -@@ -4,16 +4,5 @@
562 - lis_vector_opv.c
563 -
564 -
565 --AM_CFLAGS = -I$(top_srcdir)/include
566 -+AM_CPPFLAGS = -I$(top_srcdir)/include
567 - CLEANFILES = *.il
568 --
569 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
570 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
571 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
572 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
573 -- $(AM_FFLAGS) $(FFLAGS)
574 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
575 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
576 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
577 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
578 -- $(AM_CFLAGS) $(CFLAGS)
579 -diff -Nur lis-1.4.23.orig/test/Makefile.am lis-1.4.23/test/Makefile.am
580 ---- lis-1.4.23.orig/test/Makefile.am 2014-01-14 21:30:01.360264625 -0800
581 -+++ lis-1.4.23/test/Makefile.am 2014-01-14 21:34:47.093078248 -0800
582 -@@ -5,15 +5,16 @@
583 -
584 - EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx
585 -
586 --testdir = ${prefix}/share/examples/lis
587 -+testdir = $(libdir)/lis/examples
588 -
589 - test_DATA = testmat.mtx testmat2.mtx
590 -
591 - test_SCRIPTS = defs test.sh
592 -
593 --test_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
594 -+check_PROGRAMS = test1 test2 test2b test3 test3b test4 test5 test6 etest1 etest2 etest3 etest4 etest5 etest6 spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
595 - if ENABLE_FORTRAN
596 -- test_PROGRAMS += test1f test4f etest1f etest4f
597 -+ check_PROGRAMS += test1f test4f etest1f etest4f
598 -+ LDADD += $(FLIBS)
599 - endif
600 -
601 - test1_SOURCES = test1.c
602 -@@ -44,38 +45,11 @@
603 - etest4f_SOURCES = etest4f.F
604 - endif
605 -
606 --bin_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
607 -+noinst_PROGRAMS = lsolve esolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
608 -
609 - lsolve_SOURCES = test1.c
610 - esolve_SOURCES = etest5.c
611 -
612 --PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
613 -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
614 --LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
615 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
616 -- $(AM_FFLAGS) $(FFLAGS)
617 --COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
618 -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
619 --LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
620 -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
621 -- $(AM_CFLAGS) $(CFLAGS)
622 --
623 --if ENABLE_SAAMG
624 -- LINK = $(LIBTOOL) --mode=link $(FC) \
625 -- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
626 -- F77LINK = $(LIBTOOL) --mode=link $(FC) \
627 -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
628 --else
629 --if ENABLE_FORTRAN
630 -- LINK = $(LIBTOOL) --mode=link $(FC) \
631 -- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
632 -- F77LINK = $(LIBTOOL) --mode=link $(F77) \
633 -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
634 --else
635 -- LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS)
636 --endif
637 --endif
638 --
639 - CLEANFILES = *.il
640 -
641 -