From 55beacdc385424770c78cf055e8fd426075506f1 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 3 Aug 2011 19:08:20 +0100
Subject: [PATCH] libafsauthent: Add volser and vldb

Add the volser and vldb families of functions to libafsauthent. This
allows applications such as per-AFS which are building pthreaded clients
to use a single library, rather than trying to mix LWP and pthreaded
code within the same process.

Change-Id: I3682876e91ca03311a798ac71e3a7a28f3205d42
Reviewed-on: http://gerrit.openafs.org/5157
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 Makefile.in                   |  2 +-
 src/libafsauthent/Makefile.in | 46 ++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 38c85183f2..1fed1f5144 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -576,7 +576,7 @@ libafsrpc: rx rxkad rxstat fsint hcrypto
 		echo Not building MT libafsrpc for ${SYS_NAME} ;; \
 	esac
 
-libafsauthent: ubik auth kauth libafsrpc
+libafsauthent: ubik auth kauth libafsrpc volser vlserver
 	+case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
 	${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in
index c90d0a33e1..bffe8b4f5e 100644
--- a/src/libafsauthent/Makefile.in
+++ b/src/libafsauthent/Makefile.in
@@ -19,6 +19,8 @@ UBIK = $(srcdir)/../ubik
 UTIL = $(srcdir)/../util
 RXKAD = $(srcdir)/../rxkad
 PTSERVER = $(srcdir)/../ptserver
+VOLSER = $(srcdir)/../volser
+VLSERVER = $(srcdir)/../vlserver
 SYS = $(srcdir)/../sys
 
 AUDITOBJS = audit.o audit-file.o audit-sysvmq.o
@@ -82,6 +84,19 @@ PTSERVEROBJS = \
 	display.o \
 	pterror.o
 
+VOLSEROBJS = \
+	vsprocs.o \
+	vsutils.o \
+	lockprocs.o \
+	volint.xdr.o \
+	volint.cs.o \
+	volerr.o
+
+VLDBOBJS = \
+	vldbint.xdr.o \
+	vldbint.cs.o \
+	vl_errors.o
+
 LIBOBJS = \
 	${AUDITOBJS} \
 	${AUTHOBJS} \
@@ -90,7 +105,9 @@ LIBOBJS = \
 	${UTILOBJS} \
 	${RXKADOBJS} \
 	${PTSERVEROBJS} \
-	${SYSOBJS}
+	${SYSOBJS} \
+	${VOLSEROBJS} \
+	${VLDBOBJS}
 
 all: ${TOP_LIBDIR}/libafsauthent.a
 
@@ -266,6 +283,33 @@ setpag.o: ${SYS}/setpag.c
 pioctl.o: ${SYS}/pioctl.c
 	${AFS_CCRULE} ${SYS}/pioctl.c
 
+vsprocs.o: $(VOLSER)/vsprocs.c
+	$(AFS_CCRULE) -I../volser $(VOLSER)/vsprocs.c
+
+vsutils.o: $(VOLSER)/vsutils.c
+	$(AFS_CCRULE) $(VOLSER)/vsutils.c
+
+lockprocs.o: $(VOLSER)/lockprocs.c
+	$(AFS_CCRULE) $(VOLSER)/lockprocs.c
+
+volint.xdr.o: ../volser/volint.xdr.c
+	$(AFS_CCRULE) ../volser/volint.xdr.c
+
+volint.cs.o: ../volser/volint.cs.c
+	$(AFS_CCRULE) ../volser/volint.cs.c
+
+volerr.o: $(VOLSER)/volerr.c
+	$(AFS_CCRULE) $(VOLSER)/volerr.c
+
+vldbint.xdr.o: ../vlserver/vldbint.xdr.c
+	$(AFS_CCRULE) ../vlserver/vldbint.xdr.c
+
+vldbint.cs.o: ../vlserver/vldbint.cs.c
+	$(AFS_CCRULE) ../vlserver/vldbint.cs.c
+
+vl_errors.o: $(VLSERVER)/vl_errors.c
+	$(AFS_CCRULE) $(VLSERVER)/vl_errors.c
+
 clean:
 	$(RM) -f *.o *.a libafsauthent*