libctf-soname

Gbp-Pq: Name libctf-soname.diff

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 2ee1196790882688a59e9e3b720078e0ecb86074..4ef0b6c6877bc5a421672f56e7baaf51f8838a8a 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -165,8 +165,8 @@ BFDLIB = ../bfd/libbfd.la
 OPCODES = ../opcodes/libopcodes.la
 
 if ENABLE_LIBCTF
-LIBCTF = ../libctf/libctf.la
-LIBCTF_NOBFD = ../libctf/libctf-nobfd.la
+LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
+LIBCTF_NOBFD = ../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
 else
 LIBCTF =
 LIBCTF_NOBFD =

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 7ef2af4aff6bce67be2e1f37950c7f423be94df7..a476031c3812d405f14b3a545941b484a44e6a55 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -223,7 +223,8 @@ objcopy_LDADD = $(LDADD)
 am_objdump_OBJECTS = objdump.$(OBJEXT) dwarf.$(OBJEXT) prdbg.$(OBJEXT) \
        $(am__objects_3) $(am__objects_1) $(am__objects_2)
 objdump_OBJECTS = $(am_objdump_OBJECTS)
-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 = ../libctf/libctf.la
+@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 =  \
+@ENABLE_LIBCTF_TRUE@   ../libctf/libctf@CTF_SOVER_EXT@.la
 am_ranlib_OBJECTS = ar.$(OBJEXT) is-ranlib.$(OBJEXT) arparse.$(OBJEXT) \
        arlex.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) \
        binemul.$(OBJEXT) emul_$(EMULATION).$(OBJEXT) $(am__objects_1)
@@ -231,7 +232,8 @@ ranlib_OBJECTS = $(am_ranlib_OBJECTS)
 am_readelf_OBJECTS = readelf.$(OBJEXT) version.$(OBJEXT) \
        unwind-ia64.$(OBJEXT) dwarf.$(OBJEXT) $(am__objects_2)
 readelf_OBJECTS = $(am_readelf_OBJECTS)
-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_3 = ../libctf/libctf-nobfd.la
+@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_3 =  \
+@ENABLE_LIBCTF_TRUE@   ../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
 am_size_OBJECTS = size.$(OBJEXT) $(am__objects_1)
 size_OBJECTS = $(am_size_OBJECTS)
 size_LDADD = $(LDADD)
@@ -421,6 +423,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CTF_SOVER_EXT = @CTF_SOVER_EXT@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -547,6 +550,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -662,9 +666,9 @@ ELFLIBS = elfcomm.c
 BFDLIB = ../bfd/libbfd.la
 OPCODES = ../opcodes/libopcodes.la
 @ENABLE_LIBCTF_FALSE@LIBCTF = 
-@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf.la
+@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
 @ENABLE_LIBCTF_FALSE@LIBCTF_NOBFD = 
-@ENABLE_LIBCTF_TRUE@LIBCTF_NOBFD = ../libctf/libctf-nobfd.la
+@ENABLE_LIBCTF_TRUE@LIBCTF_NOBFD = ../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
 LIBIBERTY = ../libiberty/libiberty.a
 POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
 EXPECT = expect

diff --git a/binutils/configure b/binutils/configure
index 1eceb37ad11e4404d981c1287766d49dd74de935..e26007158865cd33a3c322c014c8a88cac31ef40 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -634,6 +634,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CTF_SOVER_EXT
 EMULATION_VECTOR
 EMULATION
 OBJDUMP_PRIVATE_OFILES
@@ -11568,7 +11569,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11571 "configure"
+#line 11572 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11674,7 +11675,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11677 "configure"
+#line 11678 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15340,6 +15341,9 @@ EMULATION_VECTOR=$targ_emul_vector
 
 
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+
+
 # Required for html and install-html
 
 

diff --git a/binutils/configure.ac b/binutils/configure.ac
index 4ac1f34a6d200d51c4eca2118d1a7b350cf20f45..06b52aa27f2db66bae3badb8379e37e7eb12d949 100644 (file)
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -480,6 +480,9 @@ EMULATION_VECTOR=$targ_emul_vector
 AC_SUBST(EMULATION)
 AC_SUBST(EMULATION_VECTOR)
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+AC_SUBST(CTF_SOVER_EXT)
+
 # Required for html and install-html
 AC_SUBST(datarootdir)
 AC_SUBST(docdir)

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 1a88965f7ca70b9731c9461f39c94bce33f3bf52..7d1758194cb1904683310da6d84e5938a4fa7b14 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -145,7 +145,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @zlibinc@ \
 BFDLIB = ../bfd/libbfd.la
 LIBIBERTY = ../libiberty/libiberty.a
 if ENABLE_LIBCTF
-LIBCTF = ../libctf/libctf.la
+LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
 else
 LIBCTF =
 endif

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 20c3bc6a0914bb0a793f1185e2f82acef77289c6..b71a496502b0378978d6bc0e33115535416b9be1 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -181,7 +181,8 @@ am_ld_new_OBJECTS = ldgram.$(OBJEXT) ldlex-wrapper.$(OBJEXT) \
        plugin.$(OBJEXT) ldbuildid.$(OBJEXT)
 ld_new_OBJECTS = $(am_ld_new_OBJECTS)
 am__DEPENDENCIES_1 =
-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 = ../libctf/libctf.la
+@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 =  \
+@ENABLE_LIBCTF_TRUE@   ../libctf/libctf@CTF_SOVER_EXT@.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -368,6 +369,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CTF_SOVER_EXT = @CTF_SOVER_EXT@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -515,6 +517,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -631,7 +634,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) @zlibinc@ \
 BFDLIB = ../bfd/libbfd.la
 LIBIBERTY = ../libiberty/libiberty.a
 @ENABLE_LIBCTF_FALSE@LIBCTF = 
-@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf.la
+@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
 
 # These all start with e so 'make clean' can find them.
 ALL_EMULATION_SOURCES = \

diff --git a/ld/configure b/ld/configure
index 4d46ef29243eb8c6c2268ed388d3657609112944..6d0c124abfd3630ecec28c29dfe31059c0b8041b 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -634,6 +634,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CTF_SOVER_EXT
 TESTCTFLIB
 TESTBFDLIB
 EMULATION_LIBPATH
@@ -12072,7 +12073,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12075 "configure"
+#line 12076 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12178,7 +12179,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12181 "configure"
+#line 12182 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17805,6 +17806,9 @@ fi
 ac_config_commands="$ac_config_commands default"
 
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+
+
 
 
 

diff --git a/ld/configure.ac b/ld/configure.ac
index 172398ff847be98b0f95dfed51343218f9e85492..f4a2c9d7399db94bdb54171dd00b2a1e05688d18 100644 (file)
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -571,6 +571,9 @@ sed -e '/^SRC-POTFILES =/r po/SRC-POTFILES' \
     -e "s,@GMOFILES@,$GMOFILES," \
     po/Makefile.in > po/Makefile]],[[]])
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+AC_SUBST(CTF_SOVER_EXT)
+
 dnl Required by html, pdf, install-pdf and install-html
 AC_SUBST(datarootdir)
 AC_SUBST(docdir)

diff --git a/libctf/Makefile.am b/libctf/Makefile.am
index c672d07e142bc07c4ac1e1d32315b10d70860dfa..22cb44c5362895151d49842b85fbcb0d52a90496 100644 (file)
--- a/libctf/Makefile.am
+++ b/libctf/Makefile.am
@@ -32,23 +32,24 @@ AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bf
 AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC)
 
 if INSTALL_LIBBFD
-lib_LTLIBRARIES = libctf.la libctf-nobfd.la
+lib_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
 include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h
 else
 include_HEADERS =
-noinst_LTLIBRARIES = libctf.la libctf-nobfd.la
+noinst_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
 endif
 
-libctf_nobfd_la_LIBADD = @SHARED_LIBADD@ $(ZLIB)
-libctf_nobfd_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
-libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \
+COMMON_LIB_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \
                          ctf-hash.c ctf-labels.c ctf-link.c ctf-lookup.c ctf-open.c \
                          ctf-string.c ctf-subr.c ctf-types.c ctf-util.c
 if NEED_CTF_QSORT_R
-libctf_nobfd_la_SOURCES += ctf-qsort_r.c
+COMMON_LIB_SOURCES += ctf-qsort_r.c
 endif
+libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD = @SHARED_LIBADD@ $(ZLIB)
+libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
+libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES)
 
-libctf_la_LIBADD = @BFD_LIBADD@ $(libctf_nobfd_la_LIBADD)
-libctf_la_DEPENDENCIES = @BFD_DEPENDENCIES@
-libctf_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
-libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c
+libctf@CTF_SOVER_EXT@_la_LIBADD = @BFD_LIBADD@ $(libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD)
+libctf@CTF_SOVER_EXT@_la_DEPENDENCIES = @BFD_DEPENDENCIES@
+libctf@CTF_SOVER_EXT@_la_LDFLAGS = $(libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS)
+libctf@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES) ctf-open-bfd.c

diff --git a/libctf/Makefile.in b/libctf/Makefile.in
index 9e6f2551a5606ce0afcb4f12b1731bb13ae2e73a..5887dd893a0b82847cd881a8f8fea3ed0fda1867 100644 (file)
--- a/libctf/Makefile.in
+++ b/libctf/Makefile.in
@@ -162,43 +162,44 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libctf_nobfd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libctf_nobfd_la_SOURCES_DIST = ctf-archive.c ctf-dump.c \
-       ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c \
-       ctf-link.c ctf-lookup.c ctf-open.c ctf-string.c ctf-subr.c \
-       ctf-types.c ctf-util.c ctf-qsort_r.c
+libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES_DIST = ctf-archive.c \
+       ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c \
+       ctf-labels.c ctf-link.c ctf-lookup.c ctf-open.c ctf-string.c \
+       ctf-subr.c ctf-types.c ctf-util.c ctf-qsort_r.c
 @NEED_CTF_QSORT_R_TRUE@am__objects_1 = ctf-qsort_r.lo
-am_libctf_nobfd_la_OBJECTS = ctf-archive.lo ctf-dump.lo ctf-create.lo \
-       ctf-decl.lo ctf-error.lo ctf-hash.lo ctf-labels.lo ctf-link.lo \
+am__objects_2 = ctf-archive.lo ctf-dump.lo ctf-create.lo ctf-decl.lo \
+       ctf-error.lo ctf-hash.lo ctf-labels.lo ctf-link.lo \
        ctf-lookup.lo ctf-open.lo ctf-string.lo ctf-subr.lo \
        ctf-types.lo ctf-util.lo $(am__objects_1)
-libctf_nobfd_la_OBJECTS = $(am_libctf_nobfd_la_OBJECTS)
+am_libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS = $(am__objects_2)
+libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS =  \
+       $(am_libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libctf_nobfd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libctf_nobfd@CTF_SOVER_EXT@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(AM_CFLAGS) $(CFLAGS) $(libctf_nobfd_la_LDFLAGS) $(LDFLAGS) \
-       -o $@
-@INSTALL_LIBBFD_FALSE@am_libctf_nobfd_la_rpath =
-@INSTALL_LIBBFD_TRUE@am_libctf_nobfd_la_rpath = -rpath $(libdir)
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am__libctf_la_SOURCES_DIST = ctf-archive.c ctf-dump.c ctf-create.c \
-       ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c ctf-link.c \
-       ctf-lookup.c ctf-open.c ctf-string.c ctf-subr.c ctf-types.c \
-       ctf-util.c ctf-qsort_r.c ctf-open-bfd.c
-am__objects_2 = ctf-archive.lo ctf-dump.lo ctf-create.lo ctf-decl.lo \
-       ctf-error.lo ctf-hash.lo ctf-labels.lo ctf-link.lo \
-       ctf-lookup.lo ctf-open.lo ctf-string.lo ctf-subr.lo \
-       ctf-types.lo ctf-util.lo $(am__objects_1)
-am_libctf_la_OBJECTS = $(am__objects_2) ctf-open-bfd.lo
-libctf_la_OBJECTS = $(am_libctf_la_OBJECTS)
-libctf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(libctf_la_LDFLAGS) $(LDFLAGS) -o $@
-@INSTALL_LIBBFD_FALSE@am_libctf_la_rpath =
-@INSTALL_LIBBFD_TRUE@am_libctf_la_rpath = -rpath $(libdir)
+       $(AM_CFLAGS) $(CFLAGS) \
+       $(libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS) $(LDFLAGS) -o $@
+@INSTALL_LIBBFD_FALSE@am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath =
+@INSTALL_LIBBFD_TRUE@am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath = -rpath \
+@INSTALL_LIBBFD_TRUE@  $(libdir)
+am__libctf@CTF_SOVER_EXT@_la_SOURCES_DIST = ctf-archive.c ctf-dump.c \
+       ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c \
+       ctf-link.c ctf-lookup.c ctf-open.c ctf-string.c ctf-subr.c \
+       ctf-types.c ctf-util.c ctf-qsort_r.c ctf-open-bfd.c
+am_libctf@CTF_SOVER_EXT@_la_OBJECTS = $(am__objects_2) ctf-open-bfd.lo
+libctf@CTF_SOVER_EXT@_la_OBJECTS =  \
+       $(am_libctf@CTF_SOVER_EXT@_la_OBJECTS)
+libctf@CTF_SOVER_EXT@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(libctf@CTF_SOVER_EXT@_la_LDFLAGS) \
+       $(LDFLAGS) -o $@
+@INSTALL_LIBBFD_FALSE@am_libctf@CTF_SOVER_EXT@_la_rpath =
+@INSTALL_LIBBFD_TRUE@am_libctf@CTF_SOVER_EXT@_la_rpath = -rpath \
+@INSTALL_LIBBFD_TRUE@  $(libdir)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -233,9 +234,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libctf_nobfd_la_SOURCES) $(libctf_la_SOURCES)
-DIST_SOURCES = $(am__libctf_nobfd_la_SOURCES_DIST) \
-       $(am__libctf_la_SOURCES_DIST)
+SOURCES = $(libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES) \
+       $(libctf@CTF_SOVER_EXT@_la_SOURCES)
+DIST_SOURCES = $(am__libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES_DIST) \
+       $(am__libctf@CTF_SOVER_EXT@_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -305,6 +307,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CTF_SOVER_EXT = @CTF_SOVER_EXT@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -438,20 +441,21 @@ ZLIBINC = @zlibinc@
 INCDIR = $(srcdir)/../include
 AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bfd -I../bfd
 AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC)
-@INSTALL_LIBBFD_TRUE@lib_LTLIBRARIES = libctf.la libctf-nobfd.la
+@INSTALL_LIBBFD_TRUE@lib_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
 @INSTALL_LIBBFD_FALSE@include_HEADERS = 
 @INSTALL_LIBBFD_TRUE@include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h
-@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf.la libctf-nobfd.la
-libctf_nobfd_la_LIBADD = @SHARED_LIBADD@ $(ZLIB)
-libctf_nobfd_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
-libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c \
-       ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c ctf-link.c \
-       ctf-lookup.c ctf-open.c ctf-string.c ctf-subr.c ctf-types.c \
-       ctf-util.c $(am__append_1)
-libctf_la_LIBADD = @BFD_LIBADD@ $(libctf_nobfd_la_LIBADD)
-libctf_la_DEPENDENCIES = @BFD_DEPENDENCIES@
-libctf_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
-libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c
+@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
+COMMON_LIB_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c \
+       ctf-error.c ctf-hash.c ctf-labels.c ctf-link.c ctf-lookup.c \
+       ctf-open.c ctf-string.c ctf-subr.c ctf-types.c ctf-util.c \
+       $(am__append_1)
+libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD = @SHARED_LIBADD@ $(ZLIB)
+libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
+libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES)
+libctf@CTF_SOVER_EXT@_la_LIBADD = @BFD_LIBADD@ $(libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD)
+libctf@CTF_SOVER_EXT@_la_DEPENDENCIES = @BFD_DEPENDENCIES@
+libctf@CTF_SOVER_EXT@_la_LDFLAGS = $(libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS)
+libctf@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES) ctf-open-bfd.c
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -552,11 +556,11 @@ clean-noinstLTLIBRARIES:
          rm -f $${locs}; \
        }
 
-libctf-nobfd.la: $(libctf_nobfd_la_OBJECTS) $(libctf_nobfd_la_DEPENDENCIES) $(EXTRA_libctf_nobfd_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libctf_nobfd_la_LINK) $(am_libctf_nobfd_la_rpath) $(libctf_nobfd_la_OBJECTS) $(libctf_nobfd_la_LIBADD) $(LIBS)
+libctf-nobfd@CTF_SOVER_EXT@.la: $(libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS) $(libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES) $(EXTRA_libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES) 
+       $(AM_V_CCLD)$(libctf_nobfd@CTF_SOVER_EXT@_la_LINK) $(am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath) $(libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS) $(libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD) $(LIBS)
 
-libctf.la: $(libctf_la_OBJECTS) $(libctf_la_DEPENDENCIES) $(EXTRA_libctf_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libctf_la_LINK) $(am_libctf_la_rpath) $(libctf_la_OBJECTS) $(libctf_la_LIBADD) $(LIBS)
+libctf@CTF_SOVER_EXT@.la: $(libctf@CTF_SOVER_EXT@_la_OBJECTS) $(libctf@CTF_SOVER_EXT@_la_DEPENDENCIES) $(EXTRA_libctf@CTF_SOVER_EXT@_la_DEPENDENCIES) 
+       $(AM_V_CCLD)$(libctf@CTF_SOVER_EXT@_la_LINK) $(am_libctf@CTF_SOVER_EXT@_la_rpath) $(libctf@CTF_SOVER_EXT@_la_OBJECTS) $(libctf@CTF_SOVER_EXT@_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/libctf/configure b/libctf/configure
index 1a8ed2efd2e9d35d1e5cf3f65ddcd35fe8c2267c..13a3f0f08da556daaf89d3b4a759c1ef4519d024 100755 (executable)
--- a/libctf/configure
+++ b/libctf/configure
@@ -635,6 +635,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CTF_SOVER_EXT
 VERSION_FLAGS
 BFD_DEPENDENCIES
 BFD_LIBADD
@@ -11548,7 +11549,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11551 "configure"
+#line 11552 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11654,7 +11655,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11657 "configure"
+#line 11658 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13377,6 +13378,9 @@ if $LD --help 2>&1 | grep -- --version-script >/dev/null; then
 fi
 
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+
+
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_headers="$ac_config_headers config.h"

diff --git a/libctf/configure.ac b/libctf/configure.ac
index f31108c0fade9a9efb2ee895ab5ca342676796fc..80a5c631b60f36f4770f03891f7f48668bca9930 100644 (file)
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -220,6 +220,9 @@ if $LD --help 2>&1 | grep -- --version-script >/dev/null; then
 fi
 AC_SUBST(VERSION_FLAGS)
 
+CTF_SOVER_EXT=$CTF_SOVER_EXT
+AC_SUBST(CTF_SOVER_EXT)
+
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT