From 972c45c0833171bb401ffe6d10719f050cc0cf4b Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 24 May 2012 11:55:26 +0100
Subject: [PATCH] rxkad: Add a libtool library

Add liboafs_rkxad.la, a libtool version of librxkad.a

Change-Id: I414dada02d202d8bdba4234f92d445b560dbb297
Reviewed-on: http://gerrit.openafs.org/8065
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---
 src/rxkad/Makefile.in          | 57 ++++++++++++++++++----------------
 src/rxkad/liboafs_rxkad.la.sym |  6 ++++
 2 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 src/rxkad/liboafs_rxkad.la.sym

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 9e5d317f3..093aa75e7 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -9,15 +9,24 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
-
 INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
-	${TOP_INCDIR}/rx/fcrypt.h rxkad_convert.h \
-	rxkad.h rxkad_prototypes.h fcrypt.h v5gen.h
+	${TOP_INCDIR}/rx/fcrypt.h \
+	${TOP_INCDIR}/rx/rxkad.h \
+	${TOP_INCDIR}/rx/rxkad_prototypes.h \
+	rxkad_convert.h fcrypt.h v5gen.h
 
-OBJS=rxkad_client.o rxkad_server.o rxkad_common.o rxkad_errs.o \
-	fcrypt.o crypt_conn.o ticket.o ticket5.o crc.o
+LT_objs=rxkad_client.lo rxkad_server.lo rxkad_common.lo rxkad_errs.lo \
+        fcrypt.lo crypt_conn.lo ticket.lo ticket5.lo crc.lo \
+	AFS_component_version_number.lo
+
+LT_deps=$(top_builddir)/src/comerr/liboafs_comerr.la \
+	$(top_builddir)/src/rx/liboafs_rx.la \
+	$(top_builddir)/src/opr/liboafs_opr.la
+
+LT_libs=$(LDFLAGS_hcrypto) $(LIB_hcrypto)
 
 fc_test_OBJS=fc_test.o
 
@@ -28,7 +37,8 @@ fc_test_LIBS=\
 	${TOP_LIBDIR}/liblwp.a \
 	${TOP_LIBDIR}/libafsutil.a
 
-all: ${TOP_LIBDIR}/librxkad.a depinstall
+all: ${TOP_LIBDIR}/librxkad.a liboafs_rxkad.la depinstall
+
 test: fc_test
 
 generated: \
@@ -62,18 +72,23 @@ ${TOP_INCDIR}/rx/rxkad_convert.h: rxkad_convert.h
 #
 # Build targets
 #
-librxkad.a: ${OBJS} AFS_component_version_number.o
-	-$(RM) -f $@
-	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
-	$(RANLIB) $@
+librxkad.a: $(LT_objs)
+	$(LT_LDLIB_lwp) $(LT_objs)
 
-rxkad_client.o: fcrypt.h private_data.h rxkad_client.c ${INCLS}
+liboafs_rxkad.la: liboafs_rxkad.la.sym $(LT_objs) $(LT_deps)
+	$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
-rxkad_server.o: rxkad_server.c fcrypt.h private_data.h  ${INCLS}
+CFLAGS_ticket5.lo = @CFLAGS_NOERROR@
 
-rxkad_common.o: fcrypt.h private_data.h rxkad_common.c ${INCLS}
-
-rxkad_errs.o: rxkad_errs.c
+crc.lo: crc.c ${INCLS}
+crypt_conn.lo: crypt_conn.c fcrypt.h private_data.h ${INCLS}
+fcrypt.lo: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
+rxkad_client.lo: fcrypt.h private_data.h rxkad_client.c ${INCLS}
+rxkad_server.lo: rxkad_server.c fcrypt.h private_data.h  ${INCLS}
+rxkad_common.lo: fcrypt.h private_data.h rxkad_common.c ${INCLS}
+rxkad_errs.lo: rxkad_errs.c
+ticket.lo: ticket.c lifetimes.h ${INCLS}
+ticket5.lo: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
 
 rxkad.h: rxkad_errs.c
 
@@ -81,17 +96,6 @@ rxkad_errs.c: rxkad_errs.et rxkad.p.h
 	$(RM) -f rxkad.h rxkad_errs.c
 	${COMPILE_ET} -p ${srcdir} rxkad_errs -h rxkad
 
-ticket.o: ticket.c lifetimes.h ${INCLS}
-
-CFLAGS_ticket5.o = @CFLAGS_NOERROR@
-ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
-
-crc.o: crc.c ${INCLS}
-
-fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
-
-crypt_conn.o: crypt_conn.c fcrypt.h private_data.h ${INCLS}
-
 tcrypt.o: tcrypt.c AFS_component_version_number.o
 
 tcrypt: tcrypt.o librxkad.a 
@@ -127,6 +131,7 @@ dest: librxkad.a fcrypt.h rxkad.h rxkad_prototypes.h
 # Misc. targets
 #
 clean: 
+	$(LT_CLEAN)
 	$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
 		AFS_component_version_number.c fc_test
 
diff --git a/src/rxkad/liboafs_rxkad.la.sym b/src/rxkad/liboafs_rxkad.la.sym
new file mode 100644
index 000000000..840018174
--- /dev/null
+++ b/src/rxkad/liboafs_rxkad.la.sym
@@ -0,0 +1,6 @@
+rxkad_NewClientSecurityObject
+rxkad_NewServerSecurityObject
+rxkad_GetServerInfo
+tkt_MakeTicket
+tkt_CheckTimes
+initialize_RXK_error_table
-- 
2.39.5