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
|
--- blacs-mpi-1.1/Bmake.inc~ 2008-08-13 22:23:52.000000000 +0000
+++ blacs-mpi-1.1/Bmake.inc 2008-08-13 22:42:47.000000000 +0000
@@ -55,12 +55,20 @@
MPILIBdir = $(MPIdir)/lib
MPIINCdir = $(MPIdir)/include
MPILIB = $(MPILIBdir)/shared/libmpich.so $(MPILIBdir)/shared/libpmpich.so $(MPILIBdir)/libmpich.a
-else
+endif
+ifeq ($(MPI),lam)
# for compilation with lam:
MPILIBdir = /usr/lib/lam/lib
MPIINCdir = /usr/include/lam
MPILIB = -L/usr/lib/lam/lib -llam
endif
+ifeq ($(MPI),openmpi)
+# for compilation with openmpi:
+ MPIdir = /usr/lib/openmpi
+ MPILIBdir = $(MPIdir)/lib
+ MPIINCdir = $(MPIdir)/include
+ MPILIB = -L/usr/lib/openmpi/lib -lmpi -lmpi_f77
+endif
# -------------------------------------
--- blacs-mpi-1.1/SRC/MPI/Makefile~ 2008-08-13 22:23:52.000000000 +0000
+++ blacs-mpi-1.1/SRC/MPI/Makefile 2008-08-13 22:55:32.000000000 +0000
@@ -194,8 +194,8 @@
$(F77) -c $(F77FLAGS) $*.f
mpif.h: $(MPIINCdir)/mpif.h
- rm -f mpif.h
- ln -s $< $@
+ rm -f mpif*
+ ln -s $(MPIINCdir)/mpif* .
# ------------------------------------------------------------------------
# We move C .o files to .C so that we can use the portable suffix rule for
--- blacs-mpi-1.1/TESTING/Makefile~ 2008-08-13 22:23:52.000000000 +0000
+++ blacs-mpi-1.1/TESTING/Makefile 2008-08-13 23:01:46.000000000 +0000
@@ -59,8 +59,8 @@
$(F77) -c $(F77FLAGS) $*.f
mpif.h: $(MPIINCdir)/mpif.h
- rm -f mpif.h
- ln -s $< $@
+ rm -f mpif*
+ ln -s $(MPIINCdir)/mpif* .
fpvm3.h : $(PVMINCdir)/fpvm3.h
rm -f fpvm3.h
--- blacs-mpi-1.1/debian/rules~ 2008-08-13 23:15:42.000000000 +0000
+++ blacs-mpi-1.1/debian/rules 2008-08-13 23:16:19.000000000 +0000
@@ -56,6 +56,9 @@
build-stamp-lam:
dh_testdir
[ -d TESTING/EXE ] || mkdir TESTING/EXE
+# next is a clean
+ BASEDIR=$(topdir) make cleanall
+ cd TESTING && BASEDIR=$(topdir) make clean
# build the static libraries
BASEDIR=$(topdir) MPI=lam make mpi
# the testing binaries
|
