From 47e7ecf8578422644186a07976dda40e45f27287 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 23 Aug 2012 22:58:20 +0100
Subject: [PATCH] acl: Use libtool

Change-Id: I589fc4d9b12bb23a34ef9145cd699e9ea2c4f496
Reviewed-on: http://gerrit.openafs.org/8092
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---
 src/dviced/Makefile.in        | 12 ++----------
 src/dvolser/Makefile.in       | 13 ++-----------
 src/libacl/Makefile.in        | 18 ++++++++++++------
 src/libacl/liboafs_acl.la.sym |  9 +++++++++
 src/tvolser/Makefile.in       | 13 ++-----------
 src/viced/Makefile.in         | 14 ++------------
 6 files changed, 29 insertions(+), 50 deletions(-)
 create mode 100644 src/libacl/liboafs_acl.la.sym

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index f27599774..bbb96acc5 100644
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -17,7 +17,6 @@ MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_SERVER \
 
 VICED=$(srcdir)/../viced
 VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 
@@ -26,8 +25,6 @@ VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \
 
 VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o
 
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
@@ -36,7 +33,7 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
 
 FSINTOBJS= afsint.ss.o
 
-objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} \
+objects= ${VICEDOBJS} ${VLSERVEROBJS} \
 	 ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
 SDBGOBJS = state_analyzer.o \
@@ -45,6 +42,7 @@ SDBGOBJS = state_analyzer.o \
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
      $(top_builddir)/src/sys/liboafs_sys.la \
+     $(top_builddir)/src/libacl/liboafs_acl.la \
      $(top_builddir)/src/rxkad/liboafs_rxkad.la \
      $(top_builddir)/src/rxstat/liboafs_rxstat.la \
      $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
@@ -76,12 +74,6 @@ fsstats.o: ${VICED}/fsstats.c
 serialize_state.o: ${VICED}/serialize_state.c
 	$(AFS_CCRULE) $(VICED)/serialize_state.c
 
-aclprocs.o: ${LIBACL}/aclprocs.c
-	$(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-	$(AFS_CCRULE) $(LIBACL)/netprocs.c
-
 vldbint.cs.o: ../vlserver/vldbint.cs.c
 	$(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
 
diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index 3369549bd..8e2c85724 100644
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -14,7 +14,6 @@ HELPER_SPLINT=@HELPER_SPLINT@
 MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
 
 VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 VOLSER=$(srcdir)/../volser
@@ -23,20 +22,18 @@ VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstu
 
 VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
 
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
 	 clone.o devname.o common.o ihandle.o listinodes.o \
 	 namei_ops.o nuke.o salvsync-client.o daemon_com.o
 
-objects= ${VOLSEROBJS} ${LIBACLOBJS} \
-	 ${DIROBJS} ${VOLOBJS}
+objects= ${VOLSEROBJS} ${DIROBJS} ${VOLOBJS}
 
 LIBS=	$(top_builddir)/src/cmd/liboafs_cmd.la		\
 	${TOP_LIBDIR}/libafsauthent.a   \
 	$(top_builddir)/src/sys/liboafs_sys.la \
+	$(top_builddir)/src/libacl/liboafs_acl.la \
         $(top_builddir)/src/rx/liboafs_rx.la \
         $(top_builddir)/src/rxstat/liboafs_rxstat.la \
         $(top_builddir)/src/rxkad/liboafs_rxkad.la \
@@ -86,12 +83,6 @@ vsutils.o: ${VOLSER}/vsutils.c
 lockprocs.o: ${VOLSER}/lockprocs.c
 	$(AFS_CCRULE) $(VOLSER)/lockprocs.c
 
-aclprocs.o: ${LIBACL}/aclprocs.c
-	$(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-	$(AFS_CCRULE) $(LIBACL)/netprocs.c
-
 vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
 	$(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
 
diff --git a/src/libacl/Makefile.in b/src/libacl/Makefile.in
index 03ef597b9..62e14066e 100644
--- a/src/libacl/Makefile.in
+++ b/src/libacl/Makefile.in
@@ -7,13 +7,18 @@
 
 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 = aclprocs.lo netprocs.lo AFS_component_version_number.lo
+LT_deps = $(top_builddir)/src/ptserver/liboafs_prot.la
+LT_libs =
 
 #
 # Main targets
 #
 all: \
+	liboafs_acl.la \
 	${TOP_LIBDIR}/libacl.a \
 	depinstall
 
@@ -30,14 +35,14 @@ ${TOP_INCDIR}/afs/acl.h: acl.h
 ${TOP_INCDIR}/afs/prs_fs.h: prs_fs.h
 	${INSTALL_DATA} $? $@
 
-libacl.a: aclprocs.o netprocs.o AFS_component_version_number.o
-	$(RM) -f $@
-	$(AR) crv $@ aclprocs.o netprocs.o AFS_component_version_number.o
-	$(RANLIB) $@
+libacl.a: $(LT_objs)
+	$(LT_LDLIB_lwp) $(LT_objs)
 
-aclprocs.o: aclprocs.c acl.h
+liboafs_acl.la: liboafs_acl.la.sym $(LT_objs) $(LT_deps)
+	$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
-netprocs.o: netprocs.c acl.h
+aclprocs.lo: aclprocs.c acl.h
+netprocs.lo: netprocs.c acl.h
 
 #
 # Installation targets
@@ -63,6 +68,7 @@ test:
 	cd test; $(MAKE)
 
 clean: 
+	$(LT_CLEAN)
 	$(RM) -f acltest *.o *.a core AFS_component_version_number.c
 
 include ../config/Makefile.version
diff --git a/src/libacl/liboafs_acl.la.sym b/src/libacl/liboafs_acl.la.sym
new file mode 100644
index 000000000..d4d1b1835
--- /dev/null
+++ b/src/libacl/liboafs_acl.la.sym
@@ -0,0 +1,9 @@
+acl_CheckRights
+acl_Externalize_pr
+acl_FreeACL
+acl_FreeExternalACL
+acl_HtonACL
+acl_Initialize
+acl_Internalize_pr
+acl_IsAMember
+acl_NtohACL
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index e7d594e6a..1710fdf4a 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -15,7 +15,6 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 VOLSER=$(srcdir)/../volser
@@ -26,16 +25,13 @@ VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
 
 VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.o
 
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
 	 clone.o devname.o common.o ihandle.o listinodes.o \
 	 namei_ops.o nuke.o salvsync-client.o daemon_com.o
 
-objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-	 ${DIROBJS} ${VOLOBJS}
+objects= ${VOLSEROBJS} ${DIROBJS} ${VOLOBJS}
 
 vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
 	${VOLOBJS}
@@ -58,6 +54,7 @@ LIBS_client = \
 
 LIBS_server = \
 	$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+	$(top_builddir)/src/libacl/liboafs_acl.la \
 	$(LIBS_common)
 
 all: volserver vos
@@ -101,12 +98,6 @@ vsutils.o: ${VOLSER}/vsutils.c
 lockprocs.o: ${VOLSER}/lockprocs.c
 	$(AFS_CCRULE) -I../volser $(VOLSER)/lockprocs.c
 
-aclprocs.o: ${LIBACL}/aclprocs.c
-	$(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-	$(AFS_CCRULE) $(LIBACL)/netprocs.c
-
 vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
 	$(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
 
diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index d4cee44b1..82eae10f1 100644
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -15,7 +15,6 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 
@@ -24,8 +23,6 @@ VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \
 
 VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o
 
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
@@ -34,14 +31,14 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
 
 FSINTOBJS = afsint.ss.o
 
-objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-	 ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+objects= ${VICEDOBJS} ${VLSERVEROBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
      $(top_builddir)/src/sys/liboafs_sys.la \
      $(top_builddir)/src/rxkad/liboafs_rxkad.la \
      $(top_builddir)/src/rxstat/liboafs_rxstat.la \
      $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+     $(top_builddir)/src/libacl/liboafs_acl.la \
      $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
@@ -69,13 +66,6 @@ cbd.o: callback.c AFS_component_version_number.c
 cbd: cbd.o
 	$(LT_LDRULE_static) cbd.o ${LIBS} $(LIB_roken) ${XLIBS}
 
-aclprocs.o: ${LIBACL}/aclprocs.c
-	$(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-	$(AFS_CCRULE) $(LIBACL)/netprocs.c
-
-
 vldbint.cs.o: ../vlserver/vldbint.cs.c
 	$(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
 
-- 
2.39.5