|
|
e917b60 |
--- blacs/BLACS/SRC/MPI/Makefile 2007-10-04 13:09:14.000000000 -0400
|
|
|
e917b60 |
+++ blacs/BLACS/SRC/MPI/Makefile.new 2008-09-18 14:12:10.000000000 -0400
|
|
|
e917b60 |
@@ -88,12 +88,14 @@
|
|
|
e917b60 |
make $(BLACSCINIT)
|
|
|
e917b60 |
$(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj)
|
|
|
e917b60 |
$(RANLIB) $(BLACSLIB)
|
|
|
e917b60 |
+ ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; mpif77 -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.oo -Wl,-soname=$(BLACSLIBS) ; cd .. )
|
|
|
e917b60 |
|
|
|
e917b60 |
$(BLACSFINIT) :
|
|
|
e917b60 |
$(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \
|
|
|
e917b60 |
blacs_pinfo_.c
|
|
|
e917b60 |
$(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c
|
|
|
e917b60 |
$(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o
|
|
|
e917b60 |
+ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o
|
|
|
e917b60 |
$(RANLIB) $(BLACSFINIT)
|
|
|
e917b60 |
|
|
|
e917b60 |
$(BLACSCINIT) :
|
|
|
e917b60 |
@@ -101,6 +103,7 @@
|
|
|
e917b60 |
blacs_pinfo_.c
|
|
|
e917b60 |
$(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c
|
|
|
e917b60 |
$(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o
|
|
|
e917b60 |
+ $(CC) $(CCFLAGS) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o
|
|
|
e917b60 |
$(RANLIB) $(BLACSCINIT)
|
|
|
e917b60 |
|
|
|
e917b60 |
# ------------------
|
|
|
e917b60 |
@@ -129,7 +132,7 @@
|
|
|
e917b60 |
( cd INTERNAL ; rm -f bi_f77_get_constants.o bi_f77_mpi_attr_get.o \
|
|
|
e917b60 |
bi_f77_mpi_initialized.o bi_f77_mpi_op_create.o \
|
|
|
e917b60 |
bi_f77_mpi_test.o bi_f77_mpi_testall.o \
|
|
|
e917b60 |
- bi_f77_init.o Bdef.h Bconfig.h mpif.h )
|
|
|
e917b60 |
+ bi_f77_init.o Bdef.h Bconfig.h )
|
|
|
e917b60 |
( cd INTERNAL ; rm -f $(internal) )
|
|
|
e917b60 |
|
|
|
e917b60 |
# -------------------------------------
|
|
|
e917b60 |
@@ -142,7 +145,7 @@
|
|
|
e917b60 |
( cd INTERNAL ; rm -f $(internal:.o=.c) Bdef.h Bconfig.h )
|
|
|
e917b60 |
( cd INTERNAL ; rm -f bi_f77_get_constants.f bi_f77_mpi_attr_get.f \
|
|
|
e917b60 |
bi_f77_mpi_initialized.f bi_f77_mpi_op_create.f \
|
|
|
e917b60 |
- bi_f77_mpi_test.f bi_f77_mpi_testall.f mpif.h )
|
|
|
e917b60 |
+ bi_f77_mpi_test.f bi_f77_mpi_testall.f )
|
|
|
e917b60 |
|
|
|
e917b60 |
# -------------------------------------------------------------------------
|
|
|
e917b60 |
# Establish how to make logical links to the long-name C interface routines
|
|
|
e917b60 |
@@ -180,25 +183,21 @@
|
|
|
e917b60 |
# -------------------------------------
|
|
|
e917b60 |
# Compile the (ouch!) fortran internals
|
|
|
e917b60 |
# -------------------------------------
|
|
|
e917b60 |
-bi_f77_init.o : mpif.h bi_f77_init.f
|
|
|
e917b60 |
+bi_f77_init.o : bi_f77_init.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_get_constants.o : mpif.h bi_f77_get_constants.f
|
|
|
e917b60 |
+bi_f77_get_constants.o :bi_f77_get_constants.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_mpi_attr_get.o : mpif.h bi_f77_mpi_attr_get.f
|
|
|
e917b60 |
+bi_f77_mpi_attr_get.o : bi_f77_mpi_attr_get.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_mpi_initialized.o : mpif.h bi_f77_mpi_initialized.f
|
|
|
e917b60 |
+bi_f77_mpi_initialized.o : bi_f77_mpi_initialized.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_mpi_op_create.o : mpif.h bi_f77_mpi_op_create.f
|
|
|
e917b60 |
+bi_f77_mpi_op_create.o : bi_f77_mpi_op_create.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_mpi_test.o : mpif.h bi_f77_mpi_test.f
|
|
|
e917b60 |
+bi_f77_mpi_test.o : bi_f77_mpi_test.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
-bi_f77_mpi_testall.o : mpif.h bi_f77_mpi_testall.f
|
|
|
e917b60 |
+bi_f77_mpi_testall.o : bi_f77_mpi_testall.f
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
|
|
|
e917b60 |
-mpif.h : $(MPIINCdir)/mpif.h
|
|
|
e917b60 |
- rm -f mpif.h
|
|
|
e917b60 |
- ln -s $(MPIINCdir)/mpif.h mpif.h
|
|
|
e917b60 |
-
|
|
|
e917b60 |
# ------------------------------------------------------------------------
|
|
|
e917b60 |
# We move C .o files to .oo so that we can use the portable suffix rule for
|
|
|
e917b60 |
# compilation, and still have them coexist with the fortran interface
|
|
|
e917b60 |
--- blacs/BLACS/TESTING/Makefile 2006-01-18 16:36:03.000000000 -0500
|
|
|
e917b60 |
+++ blacs/BLACS/TESTING/Makefile.new 2008-09-18 15:41:47.000000000 -0400
|
|
|
e917b60 |
@@ -51,22 +51,17 @@
|
|
|
e917b60 |
cp $(BTOPdir)/TESTING/comb.dat $(TESTdir)/
|
|
|
e917b60 |
|
|
|
e917b60 |
btprim_MPI.o : btprim_MPI.f
|
|
|
e917b60 |
- make mpif.h
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
|
|
|
e917b60 |
btprim_PVM.o : btprim_PVM.f
|
|
|
e917b60 |
make fpvm3.h
|
|
|
e917b60 |
$(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
|
|
|
e917b60 |
-mpif.h : $(MPIINCdir)/mpif.h
|
|
|
e917b60 |
- rm -f mpif.h
|
|
|
e917b60 |
- ln -s $(MPIINCdir)/mpif.h mpif.h
|
|
|
e917b60 |
-
|
|
|
e917b60 |
fpvm3.h : $(PVMINCdir)/fpvm3.h
|
|
|
e917b60 |
rm -f fpvm3.h
|
|
|
e917b60 |
ln -s $(PVMINCdir)/fpvm3.h fpvm3.h
|
|
|
e917b60 |
|
|
|
e917b60 |
clean :
|
|
|
e917b60 |
- rm -f $(obj) tools.o Cbt.o mpif.h fpvm3.h
|
|
|
e917b60 |
+ rm -f $(obj) tools.o Cbt.o fpvm3.h
|
|
|
e917b60 |
|
|
|
e917b60 |
.f.o: ; $(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
--- blacs/BLACS/INSTALL/Makefile 2006-01-18 16:36:03.000000000 -0500
|
|
|
e917b60 |
+++ blacs/BLACS/INSTALL/Makefile.new 2008-09-18 15:43:07.000000000 -0400
|
|
|
e917b60 |
@@ -28,7 +28,7 @@
|
|
|
e917b60 |
$(INSTdir)/xsyserrors : syserrors.o
|
|
|
e917b60 |
$(CCLOADER) $(CCLOADFLAGS) -o $@ syserrors.o $(MPILIB)
|
|
|
e917b60 |
|
|
|
e917b60 |
-$(INSTdir)/xtc_CsameF77 : mpif.h tc_fCsameF77.o tc_cCsameF77.o
|
|
|
e917b60 |
+$(INSTdir)/xtc_CsameF77 : tc_fCsameF77.o tc_cCsameF77.o
|
|
|
e917b60 |
$(F77LOADER) $(F77LOADFLAGS) -o $@ tc_fCsameF77.o tc_cCsameF77.o $(MPILIB)
|
|
|
e917b60 |
|
|
|
e917b60 |
$(INSTdir)/xtc_UseMpich : tc_UseMpich.o
|
|
|
e917b60 |
@@ -37,17 +37,13 @@
|
|
|
e917b60 |
$(INSTdir)/xcmpi_sane : cmpi_sane.o
|
|
|
e917b60 |
$(CCLOADER) $(CCLOADFLAGS) -o $@ cmpi_sane.o $(MPILIB)
|
|
|
e917b60 |
|
|
|
e917b60 |
-$(INSTdir)/xfmpi_sane : mpif.h fmpi_sane.o
|
|
|
e917b60 |
+$(INSTdir)/xfmpi_sane : fmpi_sane.o
|
|
|
e917b60 |
$(F77LOADER) $(F77LOADFLAGS) -o $@ fmpi_sane.o $(MPILIB)
|
|
|
e917b60 |
|
|
|
e917b60 |
clean:
|
|
|
e917b60 |
rm -f size.o Fintface.o Cintface.o syserrors.o transcomm.o \
|
|
|
e917b60 |
mpi_sane.o fmpi_sane.o tc_UseMpich.o tc_fCsameF77.o tc_cCsameF77.o
|
|
|
e917b60 |
|
|
|
e917b60 |
-mpif.h : $(MPIINCdir)/mpif.h
|
|
|
e917b60 |
- rm -f mpif.h
|
|
|
e917b60 |
- ln -s $(MPIINCdir)/mpif.h mpif.h
|
|
|
e917b60 |
-
|
|
|
e917b60 |
.f.o: ; $(F77) -c $(F77FLAGS) $*.f
|
|
|
e917b60 |
.c.o:
|
|
|
e917b60 |
$(CC) -c $(CCFLAGS) $(BLACSDEFS) $<
|