From bf7e00b787460deb24ecc3939e23a73f84333ad5 Mon Sep 17 00:00:00 2001
From: Matthias Jurenz <matthias.jurenz@tu-dresden.de>
Date: Wed, 23 May 2012 08:55:00 +0000
Subject: [PATCH] - corrected underlying compiler command for mpifort-vt (@FC@
 -> vtf90) - removed useless mpi<f77|f90>-vt-wrapper-data.txt

This commit was SVN r26474.
---
 .../vt/wrappers/mpif77-vt-wrapper-data.txt.in | 21 ------------------
 .../vt/wrappers/mpif90-vt-wrapper-data.txt.in | 22 -------------------
 .../wrappers/mpifort-vt-wrapper-data.txt.in   |  2 +-
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 ompi/contrib/vt/wrappers/mpif77-vt-wrapper-data.txt.in
 delete mode 100644 ompi/contrib/vt/wrappers/mpif90-vt-wrapper-data.txt.in

diff --git a/ompi/contrib/vt/wrappers/mpif77-vt-wrapper-data.txt.in b/ompi/contrib/vt/wrappers/mpif77-vt-wrapper-data.txt.in
deleted file mode 100644
index 46816587e1..0000000000
--- a/ompi/contrib/vt/wrappers/mpif77-vt-wrapper-data.txt.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# There can be multiple blocks of configuration data, chosen by
-# compiler flags (using the compiler_args key to chose which block
-# should be activated.  This can be useful for multilib builds.  See the
-# multilib page at:
-#    https://svn.open-mpi.org/trac/ompi/wiki/compilerwrapper3264 
-# for more information.
-
-project=Open MPI
-project_short=OMPI
-version=@OMPI_VERSION@
-language=Fortran 77
-compiler_flags_env=FFLAGS
-compiler=vtf77
-extra_includes=
-preprocessor_flags=
-compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@
-linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
-required_file=@OMPI_WRAPPER_F77_REQUIRED_FILE@
-includedir=${includedir}
-libdir=${libdir}
diff --git a/ompi/contrib/vt/wrappers/mpif90-vt-wrapper-data.txt.in b/ompi/contrib/vt/wrappers/mpif90-vt-wrapper-data.txt.in
deleted file mode 100644
index d4a1af9e3b..0000000000
--- a/ompi/contrib/vt/wrappers/mpif90-vt-wrapper-data.txt.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# There can be multiple blocks of configuration data, chosen by
-# compiler flags (using the compiler_args key to chose which block
-# should be activated.  This can be useful for multilib builds.  See the
-# multilib page at:
-#    https://svn.open-mpi.org/trac/ompi/wiki/compilerwrapper3264 
-# for more information.
-
-project=Open MPI
-project_short=OMPI
-version=@OMPI_VERSION@
-language=Fortran 90
-compiler_flags_env=FCFLAGS
-compiler=vtf90
-module_option=@OMPI_FC_MODULE_FLAG@
-extra_includes=
-preprocessor_flags=
-compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@ 
-linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi_f90 -lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
-required_file=@OMPI_WRAPPER_F90_REQUIRED_FILE@
-includedir=${includedir}
-libdir=${libdir}
diff --git a/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in b/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in
index 5eac9108a3..b2ca1ac21a 100644
--- a/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in
+++ b/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in
@@ -11,7 +11,7 @@ version=@OMPI_VERSION@
 language=Fortran
 compiler_env=FC
 compiler_flags_env=FCFLAGS
-compiler=@FC@
+compiler=vtf90
 module_option=@OMPI_FC_MODULE_FLAG@
 extra_includes=
 preprocessor_flags=