mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 13:58:22 +00:00
Code Issues Releases Wiki Activity

libapparmor: libtool versionin

Browse Source 
This commit adjusts the trunk libtool versions in accordance
with the outlined rules. It also adds clarifying text to the
documentation comment to explain how to use the rules and what the
resulting outcome is. Finally, it removes a bogus argument to linker
to forcibly set the SONAME in the library, as libtool will do this
automatically (and override the passed argument).

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Steve Beattie
2014-02-25 15:34:40 -08:00
parent 410e1eb132
commit 7b9d8a1f9d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/libapparmor/src/Makefile.am
View File

@@ -1,7 +1,7 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
# variables to set the library versions used by libtool # variables to set the library versions used by libtool
# Use these rules to update the library version. # Step through these rules IN ORDER to update the library version.
# 1. Update the version information only immediately before a public release # 1. Update the version information only immediately before a public release
# of your software. More frequent updates are unnecessary, and only # of your software. More frequent updates are unnecessary, and only
# guarantee that the current interface number gets larger faster. # guarantee that the current interface number gets larger faster.
@@ -18,9 +18,17 @@ INCLUDES = $(all_includes)
# release, then # release, then
# - set AA_LIB_AGE to 0. # - set AA_LIB_AGE to 0.
# #
# The resulting library version triplet will be:
# (AA_LIB_CURRENT - AA_LIB_AGE).AA_LIB_AGE.AA_LIB_REVISION
# and the SONAME will be:
# libapparmor.so.(AA_LIB_CURRENT - AA_LIB_AGE)
#
# For more information, see:
# http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
#
AA_LIB_CURRENT = 2 AA_LIB_CURRENT = 2
AA_LIB_REVISION = 0 AA_LIB_REVISION = 0
AA_LIB_AGE = 0 AA_LIB_AGE = 1
SUFFIXES = .pc.in .pc SUFFIXES = .pc.in .pc
@@ -42,7 +50,7 @@ noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h
libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel_interface.c scanner.c libapparmor_la_SOURCES = grammar.y libaalogparse.c kernel_interface.c scanner.c
libapparmor_la_LDFLAGS = -version-info $(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic -pthread \ libapparmor_la_LDFLAGS = -version-info $(AA_LIB_CURRENT):$(AA_LIB_REVISION):$(AA_LIB_AGE) -XCClinker -dynamic -pthread \
-Wl,--version-script=$(top_srcdir)/src/libapparmor.map -Wl,-soname=libapparmor.so.1 -Wl,--version-script=$(top_srcdir)/src/libapparmor.map
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libapparmor.pc pkgconfig_DATA = libapparmor.pc