Changes to OTF:

- revised fix for OpenType Font conflicts based upon Jeff's comments in CMR #3497) - renamed libotf to libopen-trace-format - install libraries to LIBDIR (as before, no need for adjusting LD_LIBRARY_PATH) This commit was SVN r28010.
2013-02-01 13:22:13 +00:00 · 2013-02-01 13:22:13 +00:00 · 06d922005d
--- a/ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4
@ -248,14 +248,6 @@ AC_DEFUN([ACVT_COMPWRAP],
 		esac
 	])

-	AS_IF([test x"$use_extern_otf" = "xno"],
-	[
-		VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
-		VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
-		VT_WRAPPER_FC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_FC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
-		VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
-	])
-
 	AS_IF([test "$PLATFORM" = "macos"],
 	[
 		VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -Wl,-force_flat_namespace"
--- a/ompi/contrib/vt/vt/config/m4/acinclude.otf.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.otf.m4
@ -32,7 +32,7 @@ AC_DEFUN([ACVT_OTF],
 	[AS_IF([test x"$OTFDIR" != x], [OTFLIBDIR="-L$OTFDIR"lib/])])

 	AC_ARG_WITH(otf-lib,
-		AC_HELP_STRING([--with-otf-lib=OTFLIB], [use given otf lib, default: -lotf ZLIBLIBDIR ZLIBLIB ZOIDFSLIBDIR ZOIDFSLIB BMILIBDIR BMILIB]),
+		AC_HELP_STRING([--with-otf-lib=OTFLIB], [use given otf lib, default: -lopen-trace-format ZLIBLIBDIR ZLIBLIB ZOIDFSLIBDIR ZOIDFSLIB BMILIBDIR BMILIB]),
 	[OTFLIB="$withval"])

 	AC_ARG_WITH(otf-flags,
@ -52,16 +52,16 @@ AC_DEFUN([ACVT_OTF],
 		AS_IF([test x"$OTFLIB" = x -a "$otf_error" = "no"],
 		[
 			sav_LIBS=$LIBS
-			LIBS="$LIBS $OTFLIBDIR -lotf $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"
-			AC_MSG_CHECKING([whether linking with -lotf $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB works])
+			LIBS="$LIBS $OTFLIBDIR -lopen-trace-format $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"
+			AC_MSG_CHECKING([whether linking with -lopen-trace-format $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB works])
 			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); OTFLIB="-lotf $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"],[AC_MSG_RESULT([no])])
+			[AC_MSG_RESULT([yes]); OTFLIB="-lopen-trace-format $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"],[AC_MSG_RESULT([no])])
 			LIBS=$sav_LIBS
 		])

 		AS_IF([test x"$OTFLIB" = x -a "$otf_error" = "no"],
 		[
-			AC_MSG_NOTICE([error: no libotf found; check path for OTF package first...])
+			AC_MSG_NOTICE([error: no libopen-trace-format found; check path for OTF package first...])
 			otf_error="yes"
 		])
 	],
@ -184,7 +184,7 @@ dnl			[otf_conf_args="$otf_conf_args --with-mpi-inc-dir=`echo $MPIINCDIR | sed s

 		OTFINCDIR=
 		OTFLIBDIR=
-		AS_IF([test x"$OTFLIB" = x], [OTFLIB="-lotf $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"])
+		AS_IF([test x"$OTFLIB" = x], [OTFLIB="-lopen-trace-format $ZLIBLIBDIR $ZLIBLIB $ZOIDFSLIBDIR $ZOIDFSLIB $BMILIBDIR $BMILIB"])
 	])

 	AC_SUBST(OTFDIR)
--- a/ompi/contrib/vt/vt/configure.ac
+++ b/ompi/contrib/vt/vt/configure.ac
@ -437,6 +437,9 @@ AM_CONDITIONAL(AMHAVEGPU, test x"$have_cupti_callbacks" = "xyes" -o x"$have_cuda
 # Check path for node-local temporary directory
 ACVT_LTMPDIR

+# Setup compiler wrappers
+ACVT_COMPWRAP
+
 # Check for OTF
 ACVT_CONF_TITLE([Open Trace Format (OTF)])
 ACVT_OTF
@ -461,9 +464,6 @@ AS_IF([test x"$enable_config_titles" = "xyes" -a x"$check_vtrun" = "xno"],
 [AC_MSG_NOTICE([disabled via command line switch])])
 AM_CONDITIONAL(AMBUILDVTRUN, test x"$build_vtrun" = "xyes")

-# Setup compiler wrappers
-ACVT_COMPWRAP
-
 # Output files
 AC_CONFIG_FILES([Makefile
 	extlib/Makefile
--- a/ompi/contrib/vt/vt/doc/UserManual.html
+++ b/ompi/contrib/vt/vt/doc/UserManual.html
@ -2628,7 +2628,7 @@ The CUDA runtime library 3.1 creates a conflict with <TT>zlib</TT>.
  -I$VT_INSTALL_PATH/include/vampirtrace
  -L$VT_INSTALL_PATH/lib 
  -Xcompiler=-g,-finstrument-functions,-pthread
-  -lvt -lotf -lcudart -lz -ldl -lm
+  -lvt -lopen-trace-format -lcudart -lz -ldl -lm
 </PRE>
  <SMALL CLASS="FOOTNOTESIZE"><TT>$VT_INSTALL_PATH</TT> is the path to the VampirTrace installation 
  directory. It is not necessary to specify the VampirTrace include and library 
@ -3971,7 +3971,7 @@ pass FLAGS to the OTF distribution configuration
 <DT><STRONG><TT>-with-otf-lib=OTFLIB</TT></STRONG></DT>
 <DD>&nbsp;
 <BR>
-use given otf lib, default: <TT>-lotf -lz</TT>
+use given otf lib, default: <TT>-lopen-trace-format -lz</TT>

 <P>
 </DD>
@ -3979,7 +3979,7 @@ use given otf lib, default: <TT>-lotf -lz</TT>

 <P>
 If the supplied OTF library was built without zlib support then OTFLIB will
-be set to <TT>-lotf</TT>.
+be set to <TT>-lopen-trace-format</TT>.

 <P>
 <DL>
--- a/ompi/contrib/vt/vt/doc/UserManual.pdf
+++ b/ompi/contrib/vt/vt/doc/UserManual.pdf
--- a/ompi/contrib/vt/vt/extlib/otf/ChangeLog
+++ b/ompi/contrib/vt/vt/extlib/otf/ChangeLog
@ -1,7 +1,7 @@
 1.12.2openmpi
 	- fixed conflicts with OpenType Fonts:
-		- install header files to INCLUDEDIR/otf1
-		- install libraries to LIBDIR/otf1
+		- install header files to INCLUDEDIR/open-trace-format
+		- renamed OTF library to libopen-trace-format
 		- renamed otfdump to otfprint
 	- OTF library:
 		- replaced temporary workaround for handling bogus zlib
--- a/ompi/contrib/vt/vt/extlib/otf/VERSION
+++ b/ompi/contrib/vt/vt/extlib/otf/VERSION
@ -31,7 +31,7 @@ sub=2
 string=openmpi

 # library is used for the library versioning. These three numbers will be added
-# to the name of the library (e.g. libotf.so.1.2.3).
+# to the name of the library (e.g. libopen-trace-format.so.1.2.3).
 # The meaning of these numbers is as follows (from left to right):
 #
 #   current            The number of the current API exported by the library.
@ -50,5 +50,5 @@ string=openmpi
 #                      release, age must be incremented. Otherwise, reset age
 #                      to '0'.

-library=6:4:5
+library=0:0:0

--- a/ompi/contrib/vt/vt/extlib/otf/configure.ac
+++ b/ompi/contrib/vt/vt/extlib/otf/configure.ac
@ -27,11 +27,9 @@ AC_ARG_WITH(openmpi-inside, [],

 # Correct install paths
 AS_IF([test "$inside_openmpi" = "yes" -o "$includedir" = "\${prefix}/include"],
-[includedir="$includedir/otf1"])
-AS_IF([test "$inside_openmpi" = "yes" -o "$libdir" = "\${exec_prefix}/lib" -o "$libdir" = "\${prefix}/lib"],
-[libdir="$libdir/otf1"])
+[includedir="$includedir/open-trace-format"])
 AS_IF([test "$inside_openmpi" = "yes" -o "$datarootdir" = "\${prefix}/share"],
-[datarootdir="$datarootdir/otf1"])
+[datarootdir="$datarootdir/open-trace-format"])
 AS_IF([test "$docdir" = "\${datarootdir}/doc/\${PACKAGE_TARNAME}"],
 [docdir="\${datarootdir}/doc"])

--- a/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln
+++ b/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotf", "otflib\libotf_vs08.vcproj", "{6B9B49C9-75CD-400D-B736-5EACA04D0A82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopen-trace-format", "otflib\libotf_vs08.vcproj", "{6B9B49C9-75CD-400D-B736-5EACA04D0A82}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libotfaux", "otfauxlib\libotfaux_vs08.vcproj", "{6B9B49C9-75CD-400D-B736-5EACA04D0A83}"
 EndProject
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/Makefile.am
@ -29,12 +29,12 @@ noinst_HEADERS = OTF_Handler.h \
 	         OTF_Platform.h \
 	         OTF_Platform_unix.h

-lib_LTLIBRARIES = libotf.la
+lib_LTLIBRARIES = libopen-trace-format.la

-libotf_la_CFLAGS = -prefer-pic
-libotf_la_LDFLAGS = -version-info @OTF_VERSION_LIBRARY@
-libotf_la_LIBADD = $(ZLIB_LIB_LINE) $(ZOIDFS_LIB_LINE)
-libotf_la_SOURCES = \
+libopen_trace_format_la_CFLAGS = -prefer-pic
+libopen_trace_format_la_LDFLAGS = -version-info @OTF_VERSION_LIBRARY@
+libopen_trace_format_la_LIBADD = $(ZLIB_LIB_LINE) $(ZOIDFS_LIB_LINE)
+libopen_trace_format_la_SOURCES = \
 	OTF_CopyHandler.c \
 	OTF_CopyHandler_stream.c \
 	OTF_Errno.c \
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs08.vcproj
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/libotf_vs08.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="libotf"
+	Name="libopen-trace-format"
 	ProjectGUID="{6B9B49C9-75CD-400D-B736-5EACA04D0A82}"
-	RootNamespace="libotf"
+	RootNamespace="libopen-trace-format"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
--- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/Makefile.am
@ -16,7 +16,7 @@ pkgpyexec_LTLIBRARIES = _otf.la
 nodist__otf_la_SOURCES = otf_wrap.c
 _otf_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CFLAGS)
 _otf_la_LDFLAGS = -module
-_otf_la_LIBADD = $(top_builddir)/otflib/libotf.la
+_otf_la_LIBADD = $(top_builddir)/otflib/libopen-trace-format.la
 _otf_la_DEPENDENCIES = $(_otf_la_LDADD)

 otf_wrap.c : otf.i
--- a/ompi/contrib/vt/vt/extlib/otf/tests/generic_streams-mpi/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tests/generic_streams-mpi/Makefile.am
@ -7,8 +7,8 @@ check_PROGRAMS = otf_generic_streams_mpi

 otf_generic_streams_mpi_CFLAGS = $(MPICFLAGS)
 otf_generic_streams_mpi_SOURCES = generic_streams_mpi.c
-otf_generic_streams_mpi_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
-otf_generic_streams_mpi_LDADD = $(top_builddir)/otflib/libotf.la \
+otf_generic_streams_mpi_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
+otf_generic_streams_mpi_LDADD = $(top_builddir)/otflib/libopen-trace-format.la \
 	$(CLOCK_GETTIME_LIB) \
 	$(MPI_LIB_LINE)
 otf_generic_streams_mpi_CPPFLAGS = $(AM_CPPFLAGS) \
--- a/ompi/contrib/vt/vt/extlib/otf/tests/generic_streams/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tests/generic_streams/Makefile.am
@ -4,7 +4,7 @@ check_PROGRAMS = otf_generic_streams

 otf_generic_streams_SOURCES = generic_streams.c
 otf_generic_streams_DEPENDENCIES = \
-	$(top_builddir)/otflib/libotf.la
+	$(top_builddir)/otflib/libopen-trace-format.la
 otf_generic_streams_LDADD = $(otf_generic_streams_DEPENDENCIES) \
 	$(CLOCK_GETTIME_LIB)
 otf_generic_streams_CPPFLAGS = $(AM_CPPFLAGS) \
--- a/ompi/contrib/vt/vt/extlib/otf/tests/hello/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tests/hello/Makefile.am
@ -2,7 +2,7 @@ check_PROGRAMS = otf_hello

 otf_hello_SOURCES = hello.c
 otf_hello_LDADD = \
-	$(top_builddir)/otflib/libotf.la
+	$(top_builddir)/otflib/libopen-trace-format.la
 otf_hello_DEPENDENCIES = $(otf_hello_LDADD)
 otf_hello_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_builddir)/otflib \
--- a/ompi/contrib/vt/vt/extlib/otf/tests/progress/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tests/progress/Makefile.am
@ -1,8 +1,8 @@
 check_PROGRAMS = otf_progress

 otf_progress_SOURCES = progress.c
-otf_progress_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
-otf_progress_LDADD = $(top_builddir)/otflib/libotf.la
+otf_progress_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
+otf_progress_LDADD = $(top_builddir)/otflib/libopen-trace-format.la
 otf_progress_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_builddir)/otflib \
 	-I$(top_srcdir)/otflib
--- a/ompi/contrib/vt/vt/extlib/otf/tests/read_from_buffer/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tests/read_from_buffer/Makefile.am
@ -1,8 +1,8 @@
 check_PROGRAMS = otf_read_from_buffer

 otf_read_from_buffer_SOURCES = read_from_buffer.c
-otf_read_from_buffer_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
-otf_read_from_buffer_LDADD = $(top_builddir)/otflib/libotf.la
+otf_read_from_buffer_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
+otf_read_from_buffer_LDADD = $(otf_read_from_buffer_DEPENDENCIES)
 otf_read_from_buffer_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_builddir)/otflib \
 	-I$(top_srcdir)/otflib
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Makefile.am
@ -7,8 +7,8 @@ bin_PROGRAMS = \
 	otf2vtf
 endif

-otf2vtf_LDADD = $(top_builddir)/otflib/libotf.la $(VTF3_LIB_LINE)
-otf2vtf_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
+otf2vtf_LDADD = $(top_builddir)/otflib/libopen-trace-format.la $(VTF3_LIB_LINE)
+otf2vtf_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
 otf2vtf_SOURCES = \
 	Handler.h \
 	Treehash.h \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Makefile.am
@ -10,7 +10,7 @@ endif

 otfaux_DEPENDENCIES = \
 	$(top_builddir)/otfauxlib/libotfaux.la \
-	$(top_builddir)/otflib/libotf.la
+	$(top_builddir)/otflib/libopen-trace-format.la
 otfaux_LDADD = \
 	$(otfaux_DEPENDENCIES) \
 	$(MATHLIB)
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs08.vcproj
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux_vs08.vcproj
@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib;libotfaux.lib"
+				AdditionalDependencies="libopen-trace-format.lib;libotfaux.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../debug"
 				GenerateDebugInformation="true"
@ -218,7 +218,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib;libotfaux.lib"
+				AdditionalDependencies="libopen-trace-format.lib;libotfaux.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../release_static_32bit"
 				DelayLoadDLLs="$(NOINHERIT)"
@ -298,7 +298,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib;libotfaux.lib"
+				AdditionalDependencies="libopen-trace-format.lib;libotfaux.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../release_static_64bit"
 				DelayLoadDLLs="$(NOINHERIT)"
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/Makefile.am
@ -12,8 +12,8 @@ uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/otfdecompress$(EXEEXT)
 endif

-otfcompress_LDADD = $(top_builddir)/otflib/libotf.la $(ZLIB_LIB_LINE)
-otfcompress_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
+otfcompress_LDADD = $(top_builddir)/otflib/libopen-trace-format.la $(ZLIB_LIB_LINE)
+otfcompress_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
 otfcompress_SOURCES = \
 	sys_time.h \
 	otfcompress.c
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/Makefile.am
@ -5,9 +5,9 @@ bin_PROGRAMS = \
 	otfconfig
 endif

-otfconfig_LDADD = $(top_builddir)/otflib/libotf.la
+otfconfig_LDADD = $(top_builddir)/otflib/libopen-trace-format.la
 otfconfig_DEPENDENCIES = $(otfconfig_LDADD)
 otfconfig_SOURCES = \
 	otfconfig.c

-AM_CFLAGS = -DOTFCONFIG_INCLUDEDIR="\"$(includedir)\"" -DOTFCONFIG_LIBDIR="\"$(libdir)\"" -DOTFCONFIG_LIBS="\"-lotfaux -lotf $(ZLIB_LIB_LINE) $(ZOIDFS_LIB_LINE)\""
+AM_CFLAGS = -DOTFCONFIG_INCLUDEDIR="\"$(includedir)\"" -DOTFCONFIG_LIBDIR="\"$(libdir)\"" -DOTFCONFIG_LIBS="\"-lotfaux -lopen-trace-format $(ZLIB_LIB_LINE) $(ZOIDFS_LIB_LINE)\""
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Makefile.am
@ -5,7 +5,7 @@ if AMBUILDBINARIES
 bin_PROGRAMS = otfprint
 endif

-otfprint_LDADD = $(top_builddir)/otflib/libotf.la
+otfprint_LDADD = $(top_builddir)/otflib/libopen-trace-format.la
 otfprint_DEPENDENCIES = $(otfprint_LDADD)
 otfprint_SOURCES = \
 	Makefile.am \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump_vs08.vcproj
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump_vs08.vcproj
@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib"
+				AdditionalDependencies="libopen-trace-format.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../debug"
 				GenerateDebugInformation="true"
@ -217,7 +217,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib"
+				AdditionalDependencies="libopen-trace-format.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../release_static_32bit"
 				DelayLoadDLLs="$(NOINHERIT)"
@ -297,7 +297,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libotf.lib"
+				AdditionalDependencies="libopen-trace-format.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../release_static_64bit"
 				DelayLoadDLLs="$(NOINHERIT)"
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/Makefile.am
@ -5,7 +5,7 @@ bin_PROGRAMS = \
 	otfinfo
 endif

-otfinfo_LDADD = $(top_builddir)/otflib/libotf.la
+otfinfo_LDADD = $(top_builddir)/otflib/libopen-trace-format.la
 otfinfo_DEPENDENCIES = $(otfinfo_LDADD)
 otfinfo_SOURCES = \
 	handler.h \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/Makefile.common
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/Makefile.common
@ -5,10 +5,10 @@ COMMONINCLUDES = \

 COMMONCFLAGS =
 COMMONLDADD = \
-	$(top_builddir)/otflib/libotf.la \
+	$(top_builddir)/otflib/libopen-trace-format.la \
 	$(top_builddir)/otfauxlib/libotfaux.la
 COMMONDEPENDENCIES = \
-	$(top_builddir)/otflib/libotf.la \
+	$(top_builddir)/otflib/libopen-trace-format.la \
        $(top_builddir)/otfauxlib/libotfaux.la
 COMMONSOURCES = \
 	$(OTFMERGESRCDIR)/handler.h \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Makefile.common
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Makefile.common
@ -4,8 +4,8 @@ COMMONINCLUDES = \
 	-I$(top_builddir)/otfauxlib -I$(top_srcdir)/otfauxlib

 COMMONCXXFLAGS =
-COMMONLDADD = $(top_builddir)/otflib/libotf.la $(MATHLIB)
-COMMONDEPENDENCIES = $(top_builddir)/otflib/libotf.la
+COMMONLDADD = $(top_builddir)/otflib/libopen-trace-format.la $(MATHLIB)
+COMMONDEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
 COMMONSOURCES = \
 	$(OTFPROFILESRCDIR)/clustering.h \
 	$(OTFPROFILESRCDIR)/collect_data.h \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Makefile.am
@ -5,7 +5,7 @@ bin_PROGRAMS = \
 	otfshrink
 endif

-otfshrink_LDADD = $(top_builddir)/otflib/libotf.la
+otfshrink_LDADD = $(top_builddir)/otflib/libopen-trace-format.la
 otfshrink_DEPENDENCIES = $(otfaux_LDADD)
 otfshrink_SOURCES = \
 	otfshrink.h \
--- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Makefile.am
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Makefile.am
@ -7,8 +7,8 @@ bin_PROGRAMS = \
 	vtf2otf
 endif

-vtf2otf_LDADD = $(top_builddir)/otflib/libotf.la $(VTF3_LIB_LINE)
-vtf2otf_DEPENDENCIES = $(top_builddir)/otflib/libotf.la
+vtf2otf_LDADD = $(top_builddir)/otflib/libopen-trace-format.la $(VTF3_LIB_LINE)
+vtf2otf_DEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
 vtf2otf_SOURCES = \
 	Handler.h \
 	Stack.h \
--- a/ompi/contrib/vt/vt/tools/vtfilter/Makefile.common
+++ b/ompi/contrib/vt/vt/tools/vtfilter/Makefile.common
@ -4,7 +4,7 @@ OTFLIBRARY = $(OTFLIBDIR) $(OTFLIB)
 OTFDEPENDENCIES =
 else
 OTFINCLUDE = -I$(top_srcdir)/extlib/otf/otflib -I$(top_builddir)/extlib/otf/otflib
-OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libotf.la
+OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libopen-trace-format.la
 OTFDEPENDENCIES = $(OTFLIBRARY)
 endif

--- a/ompi/contrib/vt/vt/tools/vtunify/Makefile.common
+++ b/ompi/contrib/vt/vt/tools/vtunify/Makefile.common
@ -86,7 +86,7 @@ OTFLIBRARY = $(OTFLIBDIR) $(OTFLIB)
 OTFDEPENDENCIES =
 else
 OTFINCLUDE = -I$(top_srcdir)/extlib/otf/otflib -I$(top_builddir)/extlib/otf/otflib
-OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libotf.la
+OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libopen-trace-format.la
 OTFDEPENDENCIES = $(OTFLIBRARY)
 endif

--- a/ompi/contrib/vt/vt/vtlib/Makefile.am
+++ b/ompi/contrib/vt/vt/vtlib/Makefile.am
@ -57,7 +57,7 @@ OTFLIBRARY = $(OTFLIBDIR) $(OTFLIB)
 OTFDEPENDENCIES =
 else
 OTFCFLAGS = -I$(top_srcdir)/extlib/otf/otflib -I$(top_builddir)/extlib/otf/otflib
-OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libotf.la
+OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libopen-trace-format.la
 OTFDEPENDENCIES = $(OTFLIBRARY)
 endif