From 10a7428b79e44b203a132e70cf929a6ee9b18650 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Fri, 6 Apr 2012 23:56:30 +0100
Subject: [PATCH] shlibafsauthent: Add a load more objects

The perl-AFS module needs to link against a pthreaded, PIC, library
that contains all of the routines that it provides perl shims for.
At the moment, libafsrpc_pic and libafsauthent_pic are the only such
libraries that OpenAFS provides.

Add all of the necessary objects to libafsauthent_pic such that the
2.6.2 version of perl-AFS can build with a minimal set of patches.
Minimise the damage by only making these available through the static
version of the libafsauthent_pic library.

Change-Id: I5a2aa5f5fbcfbe15aa7a23c3ab57b34b979ab2f3
Reviewed-on: http://gerrit.openafs.org/7070
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---
 Makefile.in                     |  2 +-
 src/shlibafsauthent/Makefile.in | 91 ++++++++++++++++++++++++++++++++-
 2 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f9a7f9bcb..21dee8413 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -596,7 +596,7 @@ shlibafsrpc: rx rxstat fsint rxkad hcrypto
 		echo Not building shared libafsrpc for ${SYS_NAME} ;; \
 	esac
 
-shlibafsauthent: ubik auth kauth shlibafsrpc
+shlibafsauthent: bozo ubik auth kauth shlibafsrpc
 	+case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*|*nbsd*|*obsd*|*fbsd*) \
 	${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index a94156f68..e430b8564 100644
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -26,6 +26,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
@@ -66,7 +68,11 @@ UTILOBJS = \
 	get_krbrlm.o \
 	dirpath.o \
 	serverLog.o \
-	fileutil.o
+	fileutil.o \
+	hostparse.o \
+	uuid.o \
+	ktime.o \
+	volparse.o
 
 RXKADOBJS = \
 	rxkad_errs.o
@@ -89,6 +95,30 @@ PTSERVEROBJS = \
 	display.o \
 	pterror.o
 
+VOLSEROBJS = \
+	vsutils.o \
+	vsprocs.o \
+	lockprocs.o \
+	volint.xdr.o \
+	volint.cs.o \
+	volerr.o
+
+VLDBOBJS = \
+	vldbint.xdr.o \
+	vldbint.cs.o \
+	vl_errors.o
+
+COMERROBJS = \
+	et_name.o
+
+BOSOBJS = \
+	bosint.xdr.o \
+	bosint.cs.o \
+	boserr.o
+
+USDOBJS = \
+	usd_file.o \
+
 LIBOBJS = \
 	${AUDITOBJS} \
 	${AUTHOBJS} \
@@ -97,7 +127,12 @@ LIBOBJS = \
 	${UTILOBJS} \
 	${RXKADOBJS} \
 	${PTSERVEROBJS} \
-	${SYSOBJS}
+	${SYSOBJS} \
+	${VOLSEROBJS} \
+	${VLDBOBJS} \
+	${COMERROBJS} \
+	$(BOSOBJS) \
+	$(USDOBJS)
 
 LIBAFSAUTHENT = libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}.${LIBAFSAUTHENTMINOR}
 
@@ -237,6 +272,18 @@ serverLog.o: ${UTIL}/serverLog.c
 fileutil.o: ${UTIL}/fileutil.c
 	${AFS_CCRULE} ${UTIL}/fileutil.c
 
+hostparse.o: ${UTIL}/hostparse.c
+	${AFS_CCRULE} ${UTIL}/hostparse.c
+
+volparse.o: ${UTIL}/volparse.c
+	${AFS_CCRULE} ${UTIL}/volparse.c
+
+uuid.o: ${UTIL}/uuid.c
+	${AFS_CCRULE} ${UTIL}/uuid.c
+
+ktime.o: ${UTIL}/ktime.c
+	${AFS_CCRULE} ${UTIL}/ktime.c
+
 pthread_glock.o: ${UTIL}/pthread_glock.c
 	${AFS_CCRULE} ${UTIL}/pthread_glock.c
 
@@ -285,6 +332,46 @@ 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) -I../volser $(VOLSER)/vsutils.c
+
+lockprocs.o: $(VOLSER)/lockprocs.c
+	$(AFS_CCRULE) -I../volser $(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
+
+et_name.o: ../comerr/et_name.c
+	${AFS_CCRULE} ../comerr/et_name.c
+
+bosint.xdr.o: ../bozo/bosint.xdr.c
+	$(AFS_CCRULE) ../bozo/bosint.xdr.c
+
+bosint.cs.o: ../bozo/bosint.cs.c
+	$(AFS_CCRULE) ../bozo/bosint.cs.c
+
+boserr.o: ../bozo/boserr.c
+	$(AFS_CCRULE) ../bozo/boserr.c
+
+usd_file.o: ../usd/usd_file.c
+	$(AFS_CCRULE) ../usd/usd_file.c
 clean:
 	$(RM) -f *.o *.a libafsauthent.a* libafsauthent.sl* libafsauthent.so* \
 		libafsauthent_pic.a libafsauthent.dylib.* \
-- 
2.39.5