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
|
libotf2.so might be used for OpenType Font format library. Better stick
coherency with otf1 naming for the soname, to avoid future conflict and
confusion.
---
otf2-build.pc.in | 2 +-
src/Makefile.inc.am | 24 ++++++++++++++++++------
src/tools/otf2_config/otf2_config.cpp | 2 +-
3 files changed, 20 insertions(+), 8 deletions(-)
--- a/src/Makefile.inc.am
+++ b/src/Makefile.inc.am
@@ -170,22 +170,34 @@ common_lib_ldflags += $(OTF2_SIONLIB_LDF
common_lib_libadd += $(OTF2_SIONLIB_LIBS)
endif
-lib_LTLIBRARIES += libotf2.la
-libotf2_la_LDFLAGS = \
+lib_LTLIBRARIES += libopen_trace_format2.la
+libopen_trace_format2_la_LDFLAGS = \
$(common_lib_ldflags) \
-version-info @LIBRARY_INTERFACE_VERSION@
-libotf2_la_SOURCES =
-libotf2_la_LIBADD = \
+libopen_trace_format2_la_SOURCES =
+libopen_trace_format2_la_LIBADD = \
lib_otf2.la \
$(common_lib_libadd)
+.libs/libotf2.a: libopen_trace_format2.la
+ ln -sf libopen_trace_format2.a $@
+.libs/libotf2.so: libopen_trace_format2.la
+ ln -sf libopen_trace_format2.so $@
+libotf2.la: .libs/libotf2.so .libs/libotf2.a
+ echo -e "# Generated by libtool\nlibrary_names='libotf2.so'\ninstalled=no\nlibdir='/usr/lib/$(DEB_HOST_MULTIARCH)'\n" > $@
+
+all-local: libotf2.la
+
+clean-local:
+ rm -f libotf2.a libotf2.so libotf2.la
+
# Libtool does not choke on '-shared -static', it will happily build a
# static lib then, even when '--disable-shared --disable-static' was given
if !USER_BUILD_STATIC_LIBRARIES
-libotf2_la_LDFLAGS += -shared
+libopen_trace_format2_la_LDFLAGS += -shared
endif !USER_BUILD_STATIC_LIBRARIES
if !USER_BUILD_SHARED_LIBRARIES
-libotf2_la_LDFLAGS += -static
+libopen_trace_format2_la_LDFLAGS += -static
endif !USER_BUILD_SHARED_LIBRARIES
EXTRA_DIST += \
--- a/otf2-build.pc.in
+++ b/otf2-build.pc.in
@@ -2,7 +2,7 @@ prefix=@PREFIX@
exec_prefix=${prefix}
libdir=@LIBDIR@
includedir=@INCLUDEDIR@
-otf2_libs=-L${libdir} -lotf2 @OTF2_TIMER_LIB@
+otf2_libs=-L${libdir} -lopen_trace_format2 @OTF2_TIMER_LIB@
otf2_sionlib_libs=@OTF2_SIONLIB_LDFLAGS@ @OTF2_SIONLIB_LIBS@
Name: otf2-@AFS_PACKAGE_BUILD_name@
--- a/src/tools/otf2_config/otf2_config.cpp
+++ b/src/tools/otf2_config/otf2_config.cpp
@@ -318,7 +318,7 @@ main( int argc,
string str;
string temp;
deque<string> libs;
- libs.push_back( "libotf2" );
+ libs.push_back( "libopen_trace_format2" );
switch ( action )
{
|
