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.

Reviewed-on: http://gerrit.openafs.org/7070
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
This is a 1.6 version of this change, which adds some additional
symbols and objects to cater for differences between master and 1.6
The changes aren't relevant to master, as the whole shared library
situation there is now completely different.

Change-Id: Iad596cd92bc883e47c5d261886db61e9c7482112
Reviewed-on: http://gerrit.openafs.org/8811
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>

diff --git a/Makefile.in b/Makefile.in
index 57ea873f66cd9d0a86774012b9f3b1cf350f3d1a..b677cf24beb357d85b80f99a666ccfa1ca192e47 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -611,7 +611,7 @@ shlibafsrpc: rx rxstat fsint rxkad des
                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 dddff33a5cae642f213a26f584f2bb2b07f5ce9b..d197b6b305333748be9f1747d7f6e8678e451d3c 100644 (file)
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -25,11 +25,14 @@ CCRULE = ${CC} ${CFLAGS} -c $?
 
 AUDIT= ../audit
 AUTH = ../auth
+CMD  = ../cmd
 KAUTH = ../kauth
 UBIK = ../ubik
 UTIL = ../util
 RXKAD = ../rxkad
 PTSERVER = ../ptserver
+VOLSER = ../volser
+VLSERVER = ../vlserver
 SYS = ../sys
 
 AUDITOBJS = audit.o audit-file.o audit-sysvmq.o
@@ -43,6 +46,10 @@ AUTHOBJS = \
        ktc_errors.o \
        acfg_errors.o
 
+CMDOBJS = \
+       cmd.o \
+       cmd_errors.o
+
 KAUTHOBJS = \
        kauth.xdr.o \
        kauth.cs.o \
@@ -67,11 +74,15 @@ UTILOBJS = \
        pthread_glock.o \
        get_krbrlm.o \
        dirpath.o \
+       hostparse.o \
        serverLog.o \
        snprintf.o \
        strlcat.o \
        strlcpy.o \
-       fileutil.o
+       fileutil.o \
+       uuid.o \
+       ktime.o \
+       volparse.o
 
 RXKADOBJS = \
        rxkad_errs.o
@@ -94,15 +105,42 @@ 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
+
+BOSOBJS = \
+       bosint.xdr.o \
+       bosint.cs.o \
+       boserr.o
+
+USDOBJS = \
+       usd_file.o \
+
 LIBOBJS = \
        ${AUDITOBJS} \
        ${AUTHOBJS} \
+       ${CMDOBJS} \
        ${KAUTHOBJS} \
        ${UBIKOBJS} \
        ${UTILOBJS} \
        ${RXKADOBJS} \
        ${PTSERVEROBJS} \
-       ${SYSOBJS}
+       ${SYSOBJS} \
+       ${VOLSEROBJS} \
+       ${VLDBOBJS} \
+       $(BOSOBJS) \
+       $(USDOBJS) \
+       AFS_component_version_number.o
 
 LIBAFSAUTHENT = libafsauthent.${SHLIB_SUFFIX}.${LIBAFSAUTHENTMAJOR}.${LIBAFSAUTHENTMINOR}
 
@@ -170,6 +208,12 @@ ktc_errors.o: ${AUTH}/ktc_errors.c
 acfg_errors.o: ${AUTH}/acfg_errors.c
        ${CCRULE}
 
+cmd.o: ${CMD}/cmd.c
+       ${CCRULE}
+
+cmd_errors.o: ${CMD}/cmd_errors.c
+       ${CCRULE}
+
 kauth.xdr.o: ${KAUTH}/kauth.xdr.c
        ${CCRULE}
 
@@ -239,6 +283,18 @@ strlcpy.o: ${UTIL}/strlcpy.c
 fileutil.o: ${UTIL}/fileutil.c
        ${CCRULE}
 
+hostparse.o: ${UTIL}/hostparse.c
+       ${CCRULE}
+
+volparse.o: ${UTIL}/volparse.c
+       ${CCRULE}
+
+uuid.o: ${UTIL}/uuid.c
+       ${CCRULE}
+
+ktime.o: ${UTIL}/ktime.c
+       ${CCRULE}
+
 pthread_glock.o: ${UTIL}/pthread_glock.c
        ${CCRULE}
 
@@ -303,7 +359,54 @@ setpag.o: ${SYS}/setpag.c
 pioctl.o: ${SYS}/pioctl.c
        ${CCRULE}
 
+vsprocs.o: $(VOLSER)/vsprocs.c
+       $(CCRULE) -I../volser
+
+vsutils.o: $(VOLSER)/vsutils.c
+       $(CCRULE) -I../volser
+
+lockprocs.o: $(VOLSER)/lockprocs.c
+       $(CCRULE) -I../volser
+
+volint.xdr.o: ../volser/volint.xdr.c
+       $(CCRULE)
+
+volint.cs.o: ../volser/volint.cs.c
+       $(CCRULE)
+
+volerr.o: ../volser/volerr.c
+       $(CCRULE)
+
+vldbint.xdr.o: ../vlserver/vldbint.xdr.c
+       $(CCRULE)
+
+vldbint.cs.o: ../vlserver/vldbint.cs.c
+       $(CCRULE)
+
+vl_errors.o: ../vlserver/vl_errors.c
+       $(CCRULE)
+
+et_name.o: ../comerr/et_name.c
+       $(CCRULE)
+
+bosint.xdr.o: ../bozo/bosint.xdr.c
+       $(CCRULE)
+
+bosint.cs.o: ../bozo/bosint.cs.c
+       $(CCRULE)
+
+boserr.o: ../bozo/boserr.c
+       $(CCRULE)
+
+usd_file.o: ../usd/usd_file.c
+       $(CCRULE)
+
+AFS_component_version_number.o: AFS_component_version_number.c
+       $(CCRULE)
+
+include ../config/Makefile.version
+
 clean:
        $(RM) -f *.o *.a libafsauthent.a* libafsauthent.sl* libafsauthent.so* \
                libafsauthent_pic.a libafsauthent.dylib.* \
-               libafsauthent.exp
+               libafsauthent.exp AFS_component_version_number.c