1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
|
From 81a98c67bd4e0653d719c76acd8f40d99b307d3e Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz93@gmail.com>
Date: Sun, 31 Mar 2024 14:50:03 -0400
Subject: [PATCH] Import undocumented patch: lis-1.6.2-autotools.patch
---
configure.ac | 47 ++++---------------------------------
src/Makefile.am | 2 +-
src/array/Makefile.am | 13 +---------
src/esolver/Makefile.am | 13 +---------
src/fortran/Makefile.am | 11 ---------
src/fortran/amg/Makefile.am | 19 ---------------
src/matrix/Makefile.am | 13 +---------
src/matvec/Makefile.am | 13 +---------
src/precision/Makefile.am | 13 +---------
src/precon/Makefile.am | 13 +---------
src/solver/Makefile.am | 13 +---------
src/system/Makefile.am | 13 +---------
src/vector/Makefile.am | 13 +---------
test/Makefile.am | 39 +++++-------------------------
14 files changed, 20 insertions(+), 215 deletions(-)
diff --git a/configure.ac b/configure.ac
index 02f226d..b887b13 100755
--- a/configure.ac
+++ b/configure.ac
@@ -500,26 +500,6 @@ if test "$TARGET" = ""; then
done
AC_MSG_CHECKING([for C compiler vendor])
AC_MSG_RESULT($[ax_cv_]_AC_LANG_ABBREV[_compiler_vendor])
- case $ax_cv_c_compiler_vendor in
- dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host $CFLAGS" ;;
- gnu) CFLAGS="-O3 -fomit-frame-pointer $CFLAGS" ;;
- intel) CFLAGS="-ansi_alias $CFLAGS" ;;
- portland) CFLAGS="-O3 -B -fastsse $CFLAGS" ;;
- pathscale) CFLAGS="-O3 $CFLAGS" ;;
- ibm) CFLAGS="-O3 -qansialias -w -qarch=auto -qtune=auto $CFLAGS"
- AR="ar -X any"
- ;;
- sun) case `(uname -m) 2>/dev/null` in
- "i86pc") CFLAGS="-xtarget=native -xO5 -dalign $CFLAGS"
- LDFLAGS="-xtarget=native -xO5"
- ;;
- *) CFLAGS="-xtarget=native64 -xO5 -dalign $CFLAGS"
- LDFLAGS="-xtarget=native64 -xO5"
- ;;
- esac
- ;;
- hp) CFLAGS="+Oall +Optrs_ansi +DSnative $CFLAGS" ;;
- esac
AC_DEFUN([_AX_PROG_FC_V_OUTPUT],
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
@@ -666,6 +646,10 @@ if test "$enable_fortran" = "yes" || test "$enable_f90" = "yes" || test "$enable
AC_LANG_PUSH(Fortran 77)
fflags_save="$FFLAGS"
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])
+
+ AC_F77_LIBRARY_LDFLAGS
+ AC_F77_DUMMY_MAIN
+
FFLAGS="$fflags_save"
if test "$TARGET" = ""; then
if test "$enable_mpi" = "yes"; then
@@ -710,29 +694,6 @@ if test "$TARGET" = ""; then
AC_MSG_CHECKING([for Fortran compiler vendor])
AC_MSG_RESULT($[ax_cv_]_AC_LANG_ABBREV[_compiler_vendor])
AC_LANG_POP(Fortran 77)
- case $ax_cv_f77_compiler_vendor in
- gnu) FFLAGS="-O3 -fomit-frame-pointer $FFLAGS"
- FCFLAGS="-O3 -fomit-frame-pointer $FCFLAGS" ;;
- intel) FFLAGS="-fpp $FFLAGS"
- FCFLAGS="-fpp $FCFLAGS"
- LDFLAGS="-Vaxlib"
- FCLDFLAGS="-nofor_main" ;;
- portland) FFLAGS="-O3 -fastsse -Mpreprocess $FFLAGS"
- FCFLAGS="-O3 -fastsse -Mpreprocess $FCFLAGS"
- FCLDFLAGS="-Mnomain" ;;
- pathscale) FFLAGS="-O3 $FFLAGS" ;;
- ibm) FFLAGS="-O3 -qsuffix=cpp=F -qfixed=72 -w -qarch=auto -qtune=auto $FFLAGS"
- FCFLAGS="-O3 -qsuffix=cpp=F90 -w -qarch=auto -qtune=auto $FCFLAGS" ;;
- sun) case `(uname -m) 2>/dev/null` in
- "i86pc") FFLAGS="-fpp -xtarget=native -xO5 -dalign $FFLAGS"
- FCFLAGS="-fpp -xtarget=native -xO5 -dalign $FCFLAGS"
- FCLDFLAGS="-xO5" ;;
- *) FFLAGS="-fpp -xtarget=native64 -xO5 -dalign $FFLAGS"
- FCFLAGS="-fpp -xtarget=native64 -xO5 -dalign $FCFLAGS"
- FCLDFLAGS="-xO5" ;;
- esac
- ;;
- esac
if test x$ax_cv_c_compiler_vendor = x$ax_cv_f77_compiler_vendor; then
CLIBS=""
diff --git a/src/Makefile.am b/src/Makefile.am
index 2af648b..3080b78 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ if ENABLE_SAAMG
liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la
else
if ENABLE_FORTRAN
- liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la
+ liblis@LIBSUFFIX@_la_LIBADD += fortran/libfortran.la $(FLIBS)
endif
endif
liblis@LIBSUFFIX@_la_SOURCES =
diff --git a/src/array/Makefile.am b/src/array/Makefile.am
index 2f42d3c..66c9a1e 100755
--- a/src/array/Makefile.am
+++ b/src/array/Makefile.am
@@ -1,16 +1,5 @@
noinst_LTLIBRARIES = libarray.la
libarray_la_SOURCES = lis_array.c
-AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS)
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/esolver/Makefile.am b/src/esolver/Makefile.am
index 5cdc9bc..d5e77a0 100755
--- a/src/esolver/Makefile.am
+++ b/src/esolver/Makefile.am
@@ -8,16 +8,5 @@ lis_esolver_pi.c \
lis_esolver_rqi.c \
lis_esolver_si.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/fortran/Makefile.am b/src/fortran/Makefile.am
index 107c82e..fe06650 100755
--- a/src/fortran/Makefile.am
+++ b/src/fortran/Makefile.am
@@ -12,14 +12,3 @@ lisf_vector.c
AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/fortran/amg/Makefile.am b/src/fortran/amg/Makefile.am
index 798e3b0..83219c8 100755
--- a/src/fortran/amg/Makefile.am
+++ b/src/fortran/amg/Makefile.am
@@ -25,25 +25,6 @@ endif
CLEANFILES = *.mod
AM_CPPFLAGS = -I$(top_srcdir)/include
-FCCOMPILE = $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
-LTFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(AM_FCFLAGS) $(FCFLAGS)
-FCLD = $(FC)
-FCLINK = $(LIBTOOL) --mode=link $(FCLD) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-PPFCCOMPILE = $(FC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)
-LTPPFCCOMPILE = $(LIBTOOL) --mode=compile $(FC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FCFLAGS) $(FCFLAGS)
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
.NOTPARALLEL:
.NO_PARALLEL:
diff --git a/src/matrix/Makefile.am b/src/matrix/Makefile.am
index 2bb2497..ab831ee 100755
--- a/src/matrix/Makefile.am
+++ b/src/matrix/Makefile.am
@@ -17,16 +17,5 @@ lis_matrix_ops.c \
lis_matrix_rco.c \
lis_matrix_vbr.c
-AM_CFLAGS = -I$(top_srcdir)/include $(ILIBS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(ILIBS)
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/matvec/Makefile.am b/src/matvec/Makefile.am
index e23008c..2015116 100755
--- a/src/matvec/Makefile.am
+++ b/src/matvec/Makefile.am
@@ -13,16 +13,5 @@ lis_matvec_msr.c \
lis_matvec_vbr.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/precision/Makefile.am b/src/precision/Makefile.am
index af9bd47..a94183d 100755
--- a/src/precision/Makefile.am
+++ b/src/precision/Makefile.am
@@ -4,16 +4,5 @@ lis_precision_matvec.c \
lis_precision_vec.c
-AM_CFLAGS = -I$(top_srcdir)/include $(MPFLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(MPFLAG)
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/precon/Makefile.am b/src/precon/Makefile.am
index 3039cfa..14f025a 100755
--- a/src/precon/Makefile.am
+++ b/src/precon/Makefile.am
@@ -12,16 +12,5 @@ lis_precon_sainv.c \
lis_precon_ssor.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/solver/Makefile.am b/src/solver/Makefile.am
index f5c2d3d..d7ca4c3 100755
--- a/src/solver/Makefile.am
+++ b/src/solver/Makefile.am
@@ -17,16 +17,5 @@ lis_solver_qmr.c \
lis_solver_sor.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/system/Makefile.am b/src/system/Makefile.am
index 97c84f3..f495ef9 100755
--- a/src/system/Makefile.am
+++ b/src/system/Makefile.am
@@ -13,16 +13,5 @@ lis_time.c \
mt19937ar.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/src/vector/Makefile.am b/src/vector/Makefile.am
index 4c9e2e2..848adc2 100755
--- a/src/vector/Makefile.am
+++ b/src/vector/Makefile.am
@@ -4,16 +4,5 @@ lis_vector_ops.c \
lis_vector_opv.c
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
CLEANFILES = *.il
-
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
index 1a3e25a..3bc26fb 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,21 +5,21 @@ AM_LDFLAGS = $(AMDEFS)
EXTRA_DIST = defs test.sh testmat.mtx testmat2.mtx testmat3.mtx testmat4.mtx testmat0.mtx testvec0.mtx
-testdir = ${prefix}/share/examples/lis
+testdir = ${prefix}/share/lis/examples
test_DATA = testmat.mtx testmat2.mtx testmat3.mtx testmat4.mtx testmat0.mtx testvec0.mtx
test_SCRIPTS = defs test.sh
-test_PROGRAMS = etest1 etest2 etest3 etest4 etest5 etest5b etest6 etest7 getest1 getest5 getest5b spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 test1 test2 test2b test3 test3b test3c test4 test5 test6 test7
+check_PROGRAMS = etest1 etest2 etest3 etest4 etest5 etest5b etest6 etest7 getest1 getest5 getest5b spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5 test1 test2 test2b test3 test3b test3c test4 test5 test6 test7
if ENABLE_FORTRAN
- test_PROGRAMS += etest1f etest4f test1f test4f test7f
+ check_PROGRAMS += etest1f etest4f test1f test4f test7f
endif
if ENABLE_F90
- test_PROGRAMS += test2f test6f
+ check_PROGRAMS += test2f test6f
if ENABLE_SAAMG
if ENABLE_MPI
- test_PROGRAMS += test8f
+ check_PROGRAMS += test8f
endif
endif
endif
@@ -65,7 +65,7 @@ if ENABLE_F90
test8f_SOURCES = test8f.F90
endif
-bin_PROGRAMS = esolve esolver gesolve gesolver hpcg_kernel hpcg_spmvtest lsolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
+noinst_PROGRAMS = esolve esolver gesolve gesolver hpcg_kernel hpcg_spmvtest lsolve spmvtest1 spmvtest2 spmvtest2b spmvtest3 spmvtest3b spmvtest4 spmvtest5
lsolve_SOURCES = test1.c
esolve_SOURCES = etest5.c
@@ -75,33 +75,6 @@ gesolver_SOURCES = getest5b.c
hpcg_kernel_SOURCES = test3b.c
hpcg_spmvtest_SOURCES = spmvtest3b.c
-PPF77COMPILE = $(F77) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS)
-LTPPF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_FFLAGS) $(FFLAGS)
-COMPILE = $(CC) $(AMDEFS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(AMDEFS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-
-if ENABLE_SAAMG
- LINK = $(LIBTOOL) --mode=link $(FC) \
- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
- F77LINK = $(LIBTOOL) --mode=link $(FC) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
-else
-if ENABLE_FORTRAN
- LINK = $(LIBTOOL) --mode=link $(FC) \
- $(AM_LDFLAGS) $(LDFLAGS) $(FCLDFLAGS) -o $@ $(LIBS) $(CLIBS)
- F77LINK = $(LIBTOOL) --mode=link $(F77) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(CLIBS)
-else
- LINK = $(LIBTOOL) --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(LIBS)
-endif
-endif
-
CLEANFILES = *.il
--
2.43.2
|
