From 96b0307b3c79ccfc2305f98a3045b49f3c2a4723 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Mon, 8 Sep 2014 18:06:25 -0400 Subject: [PATCH] Build and install libafsauthent.so.2 During the libtool interim, we had been building a .0 but not installing it. Prior to the libtoolization of shlibafsauthent, we had installed a libafsauthent.so.1.1, which is the same version currently installed by the 1.6 branch. Since there have been backwards-incompatible ABI changes (e.g., afsconf_BuildServerSecurityObjects) since the .1.1 version, we must bump the SONAME to .2.0. At time of this writing, the libtool rules for updating the version information is found at: http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html and http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html This lets us consolidate the building of the shared and static libafsrpc and their installation), as libtool will happily do both for us at once. We explicitly do not install the .la files, as our libtool use is to be kept entirely internal. Change-Id: I283f9bb74eb9853c268e8642ac1f01741deeae2b Reviewed-on: http://gerrit.openafs.org/11462 Reviewed-by: D Brashear Tested-by: D Brashear --- src/libafsauthent/Makefile.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index 21aefc5..1993b8f 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -11,6 +11,12 @@ srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.libtool +# Increment these according to libtool's versioning rules (look them up!) +# The output library looks like libafsauthen.. +LT_current = 2 +LT_revision = 0 +LT_age = 0 + LT_objs = \ $(top_builddir)/src/audit/libaudit_pic.la \ $(top_builddir)/src/auth/libauth_pic.la \ @@ -38,6 +44,8 @@ libafsauthent.la: libafsauthent.la.sym $(LT_objs) $(LT_deps) libafsauthent_pic.l libafsauthent_pic.la: $(LT_objs) $(LT_LDLIB_pic) $(LT_objs) +# On AIX, libtool can only produce one of shared and static libraries in a +# given invocation, so we need separate rules. libafsauthent.a: $(LT_objs) libafsauthent.la $(LT_LDLIB_static) $(LT_objs) @@ -51,8 +59,10 @@ clean: $(LT_CLEAN) $(RM) -f *.o libafsauthent.a -install: libafsauthent.a libafsauthent_pic.la +install: libafsauthent.la libafsauthent.a libafsauthent_pic.la ${INSTALL} -d ${DESTDIR}${libdir} + ${LT_INSTALL_DATA} libafsauthent.la ${DESTDIR}${libdir}/libafsauthent.la + ${RM} ${DESTDIR}${libdir}/libafsauthent.la ${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/libafsauthent.a ${INSTALL_DATA} .libs/libafsauthent_pic.a ${DESTDIR}${libdir}/libafsauthent_pic.a -- 1.9.4