From: Simon Wilkinson <sxw@your-file-system.com>
Date: Wed, 22 Aug 2012 11:59:30 +0000 (+0100)
Subject: audit: Use libtool
X-Git-Tag: openafs-stable-1_8_0pre1~2011
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=9c66a1a8f38736063fbf30e55ad46acfba36d540

audit: Use libtool

Convert audit into a libtool library

Change-Id: Ie95539596deb2cda2959f5c5ab822d291c08acc0
Reviewed-on: http://gerrit.openafs.org/8088
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index b2cfdaf..5f5ee29 100644
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -14,10 +14,15 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
+LT_objs=audit.lo audit-file.lo audit-sysvmq.lo \
+	AFS_component_version_number.lo
+LT_deps = $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+	  $(top_builddir)/src/util/liboafs_util.la
 
-all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
+all: liboafs_audit.la ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
 
 ${TOP_LIBDIR}/libaudit.a: libaudit.a
 	${INSTALL_DATA} $? $@
@@ -25,14 +30,15 @@ ${TOP_LIBDIR}/libaudit.a: libaudit.a
 ${TOP_INCDIR}/afs/audit.h: audit.h
 	${INSTALL_DATA} $? $@
 
-libaudit.a: audit.o audit-file.o audit-sysvmq.o AFS_component_version_number.o
-	$(RM) -f libaudit.a
-	ar r libaudit.a audit.o audit-file.o audit-sysvmq.o AFS_component_version_number.o
-	$(RANLIB) libaudit.a
+libaudit.a: $(LT_objs)
+	$(LT_LDLIB_lwp) $(LT_objs)
 
-audit.o: audit.c audit.h audit-api.h
-audit-file.o: audit-file.c audit.h audit-api.h
-audit-sysvmq.o: audit-sysvmq.c audit.h audit-api.h
+liboafs_audit.la: liboafs_audit.la.sym $(LT_objs) $(LT_deps)
+	$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+
+audit.lo: audit.c audit.h audit-api.h
+audit-file.lo: audit-file.c audit.h audit-api.h
+audit-sysvmq.lo: audit-sysvmq.c audit.h audit-api.h
 
 # XXX-INST: where to install the AIX audit files?
 install: audit.h libaudit.a
@@ -58,6 +64,7 @@ dest: libaudit.a audit.h
 	esac ;
 
 clean:
+	$(LT_CLEAN)
 	$(RM) -f *.a *.o core AFS_component_version_number.c
 
 include ../config/Makefile.version
diff --git a/src/audit/liboafs_audit.la.sym b/src/audit/liboafs_audit.la.sym
new file mode 100644
index 0000000..e9473bb
--- /dev/null
+++ b/src/audit/liboafs_audit.la.sym
@@ -0,0 +1,7 @@
+audit_PrintStats
+osi_audit
+osi_auditU
+osi_audit_file
+osi_audit_init
+osi_audit_interface
+osi_audit_set_user_check
diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 1cede51..9f67edc 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -40,7 +40,7 @@ LIBS_common= \
 	$(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS_server= \
-	${TOP_LIBDIR}/libaudit.a \
+	$(top_builddir)/src/audit/liboafs_audit.la \
 	$(LIBS_common)
 
 LIBS_client=$(PTOBJS) \
diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index d8fbf8f..409e0c7 100644
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -33,11 +33,10 @@ LIBS_common = \
 	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
 	$(top_builddir)/src/cmd/liboafs_cmd.la \
 	$(top_builddir)/src/util/liboafs_util.la \
-	${TOP_LIBDIR}/libaudit.a \
 	$(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS_server = \
-	${TOP_LIBDIR}/libaudit.a \
+	$(top_builddir)/src/audit/liboafs_audit.la \
 	$(LIBS_common)
 
 LIBS_client = \