Use unified libtool version for all our libraries

- Our libraries are in reality so interdependent that its not even
  possible to use them independently of others, so having them
  all follow sort of independent versioning information just doesn't
  make any sense and is a PITA everytime I need to touch the data.
- This causes librpmsign soname bump with no good reason so its
  probably "evil" and all ... so sue me, its not as if anybody
  is actually using this library outside rpm itself.
This commit is contained in:
Panu Matilainen 2014-06-25 13:13:31 +03:00
parent 817959609b
commit 3f2f483515
5 changed files with 11 additions and 4 deletions

View File

@ -1,5 +1,7 @@
# Makefile for rpmbuild library.
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
@ -16,7 +18,7 @@ librpmbuild_la_SOURCES = \
parsePolicies.c policies.c \
rpmbuild_internal.h rpmbuild_misc.h
librpmbuild_la_LDFLAGS = -version-info 4:0:1
librpmbuild_la_LDFLAGS = -version-info $(rpm_version_info)
librpmbuild_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \

View File

@ -40,7 +40,7 @@ librpm_la_SOURCES = \
rpmchroot.c rpmchroot.h \
rpmplugins.c rpmplugins.h rpmplugin.h rpmug.c rpmug.h
librpm_la_LDFLAGS = -version-info 4:0:1
librpm_la_LDFLAGS = -version-info $(rpm_version_info)
librpm_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \

3
rpm.am
View File

@ -5,3 +5,6 @@ rpmlibexecdir = $(prefix)/lib/rpm
# Host independent config files
## HACK: it probably should be $(datadir)/rpm
rpmconfigdir = $(prefix)/lib/rpm
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 4:0:1

View File

@ -1,5 +1,7 @@
# Makefile for rpm library.
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
@ -25,7 +27,7 @@ librpmio_la_SOURCES += digest_nss.c
endif
librpmio_la_LDFLAGS = -version-info 4:0:1
librpmio_la_LDFLAGS = -version-info $(rpm_version_info)
librpmio_la_LIBADD = \
../misc/libmisc.la \
@WITH_NSS_LIB@ \

View File

@ -11,7 +11,7 @@ usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmsign.la
librpmsign_la_SOURCES = rpmgensig.c
librpmsign_la_LDFLAGS = -version-info 2:0:1
librpmsign_la_LDFLAGS = -version-info $(rpm_version_info)
librpmsign_la_LIBADD = \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmio/librpmio.la \