diff --git a/Makefile.in b/Makefile.in index eb9868d5d8..2b22b2b0e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -369,7 +369,7 @@ vfsck: vol ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \ esac -pam: auth shlibafsauthent shlibafsrpc +pam: auth shlibafsauthent +set -x; \ if test "@HAVE_PAM@" = "yes"; then \ ${COMPILE_PART1} pam ${COMPILE_PART2} ; \ @@ -570,7 +570,7 @@ afsmonitor: cmd comerr gtx xstat tests: rxtests ubiktests rpctestlib viced # pthread based user space RX library -libafsrpc: rx rxkad rxstat fsint hcrypto +libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util +case ${SYS_NAME} in \ alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \ ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \ @@ -594,16 +594,7 @@ libafsauthent: ubik auth kauth libafsrpc volser vlserver echo Not building MT libafsauthent for ${SYS_NAME} ;; \ esac -# pthread based user space RX library -shlibafsrpc: rx rxstat fsint rxkad hcrypto - +case ${SYS_NAME} in \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*|*nbsd*|*obsd*|*fbsd*) \ - ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \ - *) \ - echo Not building shared libafsrpc for ${SYS_NAME} ;; \ - esac - -shlibafsauthent: bozo ubik auth kauth shlibafsrpc +shlibafsauthent: bozo ubik auth kauth +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} ;; \ @@ -659,7 +650,7 @@ finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \ dviced dvolser libafscp\ venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \ - libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ + libafsauthent shlibafsauthent libadmin man-pages \ tools platform kopenafs authtools $(DIR_roken) +${COMPILE_PART1} finale ${COMPILE_PART2} @@ -667,7 +658,7 @@ finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth lo ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \ dviced dvolser libafscp\ venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \ - libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \ + libafsauthent shlibafsauthent libadmin man-pages \ tools platform kopenafs authtools $(DIR_roken) +${COMPILE_PART1} finale ${COMPILE_PART2} @@ -765,7 +756,6 @@ clean2: -${COMPILE_PART1} rxdebug ${COMPILE_CLEAN} -${COMPILE_PART1} libafsrpc ${COMPILE_CLEAN} -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN} - -${COMPILE_PART1} shlibafsrpc ${COMPILE_CLEAN} -${COMPILE_PART1} shlibafsauthent ${COMPILE_CLEAN} -${COMPILE_PART1} kopenafs ${COMPILE_CLEAN} -${COMPILE_PART1} tools ${COMPILE_CLEAN} @@ -913,7 +903,6 @@ distclean: clean src/scout/Makefile \ src/sgistuff/Makefile \ src/shlibafsauthent/Makefile \ - src/shlibafsrpc/Makefile \ src/sys/Makefile \ src/tbutc/Makefile \ src/tests/Makefile \ diff --git a/configure.ac b/configure.ac index 4537c250e3..a4f7ae3d72 100644 --- a/configure.ac +++ b/configure.ac @@ -231,7 +231,6 @@ src/rxstat/Makefile \ src/scout/Makefile \ src/sgistuff/Makefile \ src/shlibafsauthent/Makefile \ -src/shlibafsrpc/Makefile \ src/sys/Makefile \ src/tbutc/Makefile \ src/tests/Makefile \ diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 2d6d3e2af3..d6ec21b0ac 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -9,13 +9,13 @@ include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.lwp -LT_objs = error_msg.lo et_name.lo com_err.lo AFS_component_version_number.lo +LT_objs = error_msg.lo et_name.lo com_err.lo LT_deps = $(top_builddir)/src/opr/liboafs_opr.la LT_libs = $(LIB_roken) $(MT_LIBS) all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h \ ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libafscom_err.a \ - liboafs_comerr.la + liboafs_comerr.la libafsrpc_comerr.la buildtools: compile_et @@ -49,6 +49,9 @@ libafscom_err.a: $(LT_objs) liboafs_comerr.la: $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_comerr.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + # When we build this file, we're using a .c file that's in the object directory, # so we need to add the source directory to the includes to pick up local headers. # diff --git a/src/fsint/Makefile.in b/src/fsint/Makefile.in index 2719cbbb93..f0e3127911 100644 --- a/src/fsint/Makefile.in +++ b/src/fsint/Makefile.in @@ -23,11 +23,15 @@ all: \ depinstall \ generated \ ${TOP_LIBDIR}/libafsint.a \ - liboafs_fsint.la + liboafs_fsint.la \ + libafsrpc_fsint.la liboafs_fsint.la: liboafs_fsint.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_fsint.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + libafsint.a: $(LT_objs) afsint.ss.lo afscbint.ss.lo $(LT_LDLIB_lwp) $(LT_objs) afsint.ss.lo afscbint.ss.lo diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index 09ab4f8769..d73eb9e475 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -1,349 +1,74 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html +# Copyright (c) 2012 Your File System Inc. +# All rights reserved. # -# Portions Copyright (c) 2003 Apple Computer, Inc. - -# This is a pthread safe library containing rx, rxkad and des. +# This file is released under the terms of the two clause BSD +# License. For details, see the LICENSE file at the top level of +# this distribution. srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.libtool include @TOP_OBJDIR@/src/config/Makefile.pthread +LT_objs = \ + $(top_builddir)/src/fsint/libafsrpc_fsint.la \ + $(top_builddir)/src/rx/libafsrpc_rx.la \ + $(top_builddir)/src/rxkad/libafsrpc_rxkad.la \ + $(top_builddir)/src/comerr/libafsrpc_comerr.la \ + $(top_builddir)/src/util/libafsrpc_util.la \ + $(top_builddir)/src/rxstat/libafsrpc_rxstat.la \ + $(top_builddir)/src/sys/libafsrpc_sys.la \ + $(top_builddir)/src/lwp/libafsrpc_lwpcompat.la +LT_deps = \ + $(top_builddir)/src/opr/liboafs_opr.la -MODULE_CFLAGS = -DRXDEBUG +LT_libs = $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) -SFLAGS=-P -I${TOP_INCDIR} +all: libafsrpc.la libafsrpc_pic.la \ + $(TOP_LIBDIR)/libafsrpc.a \ + $(TOP_LIBDIR)/libafsrpc_pic.a -RX = ${srcdir}/../rx -RXKAD = ${srcdir}/../rxkad -RXSTAT = ${srcdir}/../rxstat -FSINT = ${srcdir}/../fsint -COMERR = ${srcdir}/../comerr -UTIL = ${srcdir}/../util -OPR = $(srcdir)/../opr -SYS = ${srcdir}/../sys -LWP = ${srcdir}/../lwp +# On AIX, we need to pull in the syscall import list from afsl.exp. Sadly +# there doesn't seem to be any way to get libtool to remember this requirement +# when it links the libafsrpc_sys.la convenience library. -SYSOBJS =\ - syscall.o +libafsrpc.la: libafsrpc.la.sym $(LT_objs) $(LT_deps) + @set -e; set -x; case "$(SYS_NAME)" in \ + rs_aix*) \ + $(LT_LDLIB_shlib) -Wl,-bI:../sys/afsl.exp \ + $(LT_objs) $(LT_deps) $(LT_libs) ;; \ + *) \ + $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs);; \ + esac -UTILOBJS =\ - assert.o \ - casestrcpy.o \ - base64.o +libafsrpc_pic.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) -COMERROBJS =\ - error_msg.o \ - et_name.o \ - com_err.o - -XDROBJS =\ - xdr.o \ - xdr_array.o \ - xdr_arrayn.o \ - xdr_rx.o \ - xdr_mem.o \ - xdr_len.o \ - xdr_int32.o \ - xdr_int64.o \ - xdr_afsuuid.o \ - xdr_update.o \ - xdr_refernce.o \ - AFS_component_version_number.o - -RXOBJS =\ - rx_event.o \ - rx_user.o \ - rx_pthread.o \ - rx.o \ - rx_null.o \ - rx_opaque.o \ - rx_call.o \ - rx_conn.o \ - rx_peer.o \ - rx_conncache.o \ - rx_globals.o \ - rx_identity.o \ - rx_getaddr.o \ - rx_misc.o \ - rx_packet.o \ - rx_rdwr.o \ - rx_stats.o \ - rx_trace.o \ - rx_multi.o - -RXSTATOBJS =\ - rxstat.o \ - rxstat.ss.o \ - rxstat.xdr.o \ - rxstat.cs.o - -FSINTOBJS =\ - afsint.cs.o \ - afsint.xdr.o \ - afscbint.cs.o \ - afscbint.xdr.o \ - afsaux.o - -RXKADOBJS =\ - rxkad_client.o \ - rxkad_server.o \ - rxkad_common.o \ - ticket.o \ - ticket5.o \ - crc.o \ - fcrypt.o \ - crypt_conn.o - -LWPOBJS = \ - fasttime.o \ - lock.o - -LIBOBJS = \ - ${RXOBJS} \ - ${XDROBJS} \ - ${RXKADOBJS} \ - ${COMERROBJS} \ - ${UTILOBJS} \ - ${SYSOBJS} \ - ${RXSTATOBJS} \ - ${LWPOBJS} \ - ${FSINTOBJS} - -all: ${TOP_LIBDIR}/libafsrpc.a - -${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a - ${INSTALL_DATA} $? $@ - -libafsrpc.a: ${LIBOBJS} - $(RM) -f $@ - $(AR) crv $@ ${LIBOBJS} - $(RANLIB) $@ - case "${SYS_NAME}" in \ +# AIX needs libafsrpc to also be linked against the syscall import list +libafsrpc.a: $(LT_objs) + $(LT_LDLIB_static) $(LT_objs) + @set -e; set -x; case "${SYS_NAME}" in \ rs_aix*) \ $(AR) crv $@ ../sys/afsl.exp;; \ esac -rx_event.o: ${RX}/rx_event.c - $(AFS_CCRULE) $(RX)/rx_event.c +${TOP_LIBDIR}/libafsrpc.a: libafsrpc.a + ${INSTALL_DATA} $? $@ -rx_user.o: ${RX}/rx_user.c - $(AFS_CCRULE) $(RX)/rx_user.c +${TOP_LIBDIR}/libafsrpc_pic.a: libafsrpc_pic.la + ${INSTALL_DATA} .libs/libafsrpc_pic.a $@ -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - -rx.o: ${RX}/rx.c - $(AFS_CCRULE) $(RX)/rx.c - -rx_conncache.o: ${RX}/rx_conncache.c - $(AFS_CCRULE) $(RX)/rx_conncache.c - -rx_peer.o: $(RX)/rx_peer.c - $(AFS_CCRULE) $(RX)/rx_peer.c - -rx_conn.o: ${RX}/rx_conn.c - $(AFS_CCRULE) $(RX)/rx_conn.c - -rx_call.o: ${RX}/rx_call.c - $(AFS_CCRULE) $(RX)/rx_call.c - -rx_null.o: ${RX}/rx_null.c - $(AFS_CCRULE) $(RX)/rx_null.c - -rx_opaque.o: ${RX}/rx_opaque.c - $(AFS_CCRULE) $(RX)/rx_opaque.c - -rx_globals.o: ${RX}/rx_globals.c - $(AFS_CCRULE) $(RX)/rx_globals.c - -rx_identity.o: ${RX}/rx_identity.c - $(AFS_CCRULE) $(RX)/rx_identity.c - -rx_getaddr.o: ${RX}/rx_getaddr.c - $(AFS_CCRULE) $(RX)/rx_getaddr.c - -rx_misc.o: ${RX}/rx_misc.c - $(AFS_CCRULE) $(RX)/rx_misc.c - -rx_packet.o: ${RX}/rx_packet.c - $(AFS_CCRULE) $(RX)/rx_packet.c - -rx_stats.o: ${RX}/rx_stats.c - $(AFS_CCRULE) $(RX)/rx_stats.c - -rx_rdwr.o: ${RX}/rx_rdwr.c - $(AFS_CCRULE) $(RX)/rx_rdwr.c - -rx_trace.o: ${RX}/rx_trace.c - $(AFS_CCRULE) $(RX)/rx_trace.c - -rx_multi.o: ${RX}/rx_multi.c - $(AFS_CCRULE) $(RX)/rx_multi.c - -${RXOBJS}: ${RX}/rx.h ${RX}/rx_user.h ${RX}/rx_globals.h \ - ${RX}/rx_clock.h ${RX}/rx_queue.h ${RX}/rx_event.h - -rxkad_client.o: ${RXKAD}/rxkad_client.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_client.c - -rxkad_server.o: ${RXKAD}/rxkad_server.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_server.c - -rxkad_common.o: ${RXKAD}/rxkad_common.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_common.c - -ticket.o: ${RXKAD}/ticket.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/ticket.c - -CFLAGS_ticket5.o = @CFLAGS_NOERROR@ -ticket5.o: ${RXKAD}/ticket5.c - $(AFS_CCRULE) -I../rxkad -I$(RXKAD) $(RXKAD)/ticket5.c - -crc.o: ${RXKAD}/crc.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/crc.c - -md4.o: ${RXKAD}/md4.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/md4.c - -md5.o: ${RXKAD}/md5.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/md5.c - -fcrypt.o: ${RXKAD}/fcrypt.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/fcrypt.c - -crypt_conn.o: ${RXKAD}/crypt_conn.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/crypt_conn.c - -AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c - -xdr.o: ${RX}/xdr.c - $(AFS_CCRULE) $(RX)/xdr.c - -xdr_int32.o: ${RX}/xdr_int32.c - $(AFS_CCRULE) $(RX)/xdr_int32.c - -xdr_int64.o: ${RX}/xdr_int64.c - $(AFS_CCRULE) $(RX)/xdr_int64.c - -xdr_array.o: ${RX}/xdr_array.c - $(AFS_CCRULE) $(RX)/xdr_array.c - -xdr_arrayn.o: ${RX}/xdr_arrayn.c - $(AFS_CCRULE) $(RX)/xdr_arrayn.c - -xdr_float.o: ${RX}/xdr_float.c - $(AFS_CCRULE) $(RX)/xdr_float.c - -xdr_len.o: ${RX}/xdr_len.c - $(AFS_CCRULE) $(RX)/xdr_len.c - -xdr_mem.o: ${RX}/xdr_mem.c - $(AFS_CCRULE) $(RX)/xdr_mem.c - -xdr_rec.o: ${RX}/xdr_rec.c - $(AFS_CCRULE) $(RX)/xdr_rec.c - -xdr_refernce.o: ${RX}/xdr_refernce.c - $(AFS_CCRULE) $(RX)/xdr_refernce.c - -xdr_rx.o: ${RX}/xdr_rx.c - $(AFS_CCRULE) $(RX)/xdr_rx.c - -xdr_update.o: ${RX}/xdr_update.c - $(AFS_CCRULE) $(RX)/xdr_update.c - -xdr_afsuuid.o: ${RX}/xdr_afsuuid.c - $(AFS_CCRULE) $(RX)/xdr_afsuuid.c - -error_msg.o: ${COMERR}/error_msg.c - $(AFS_CCRULE) $(COMERR)/error_msg.c - -et_name.o: ${COMERR}/et_name.c - $(AFS_CCRULE) $(COMERR)/et_name.c - -com_err.o: ${COMERR}/com_err.c - $(AFS_CCRULE) $(COMERR)/com_err.c - -casestrcpy.o: ${OPR}/casestrcpy.c - $(AFS_CCRULE) $(OPR)/casestrcpy.c - -assert.o: ${OPR}/assert.c - $(AFS_CCRULE) $(OPR)/assert.c - -base64.o: ${UTIL}/base64.c - $(AFS_CCRULE) $(UTIL)/base64.c - -fasttime.o: ${LWP}/fasttime.c - $(AFS_CCRULE) $(LWP)/fasttime.c - -lock.o: ${LWP}/lock.c - $(AFS_CCRULE) $(LWP)/lock.c - -syscall.o: ${SYS}/syscall.s - case "$(SYS_NAME)" in \ - sun4x_5* | sunx86_5*) \ - $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ - as -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - arm_darwin_* ) \ - touch syscall.c ; \ - ${CC} ${AFS_CFLAGS} -c syscall.c;; \ - sgi_* | *_darwin_* ) \ - ${CC} ${AFS_CFLAGS} -c ${SYS}/syscall.s;; \ - alpha_dux?? ) \ - ${AS} -P ${AFS_CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ - ${AS} -o syscall.o syscall.i; \ - $(RM) -f syscall.ss syscall.i;; \ - *bsd* ) \ - touch syscall.c ; \ - ${CC} ${AFS_CFLAGS} -c syscall.c;; \ - *) \ - $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ - as $(ASFLAGS) -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - esac - -rxstat.o: ${RXSTAT}/rxstat.c - $(AFS_CCRULE) $(RXSTAT)/rxstat.c - -rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c - -rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c - -rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c - -afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.cs.c - -afsint.xdr.o: ${TOP_OBJDIR}/src/fsint/afsint.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.xdr.c - -afscbint.cs.o: ${TOP_OBJDIR}/src/fsint/afscbint.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.cs.c - -afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c - -afsaux.o: ${FSINT}/afsaux.c - $(AFS_CCRULE) -I../fsint ${FSINT}/afsaux.c - -install: libafsrpc.a +install: libafsrpc.la libafsrpc_pic.la ${INSTALL} -d ${DESTDIR}${libdir} - ${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/libafsrpc.a + ${LT_INSTALL_DATA} libafsrpc.la ${DESTDIR}${libdir}/libafsrpc.la + $(INSTALL_DATA) .libs/libafsrpc_pic.a $(DESTDIR)$(libdir)/libafsrpc_pic.a dest: libafsrpc.a ${INSTALL} -d ${DEST}/lib ${INSTALL_DATA} libafsrpc.a ${DEST}/lib/libafsrpc.a + ${INSTALL_DATA} .libs/libafsrpc_pic.a ${DEST}/lib/libafsrpc_pic.a clean: - $(RM) -f *.o libafsrpc* + $(LT_CLEAN) + $(RM) -f *.o libafsrpc.a diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym new file mode 100644 index 0000000000..97dbde53d9 --- /dev/null +++ b/src/libafsrpc/libafsrpc.la.sym @@ -0,0 +1,174 @@ +ktohl +life_to_time +osi_AssertFailU +osi_Panic +rx_DestroyConnection +rx_EndCall +rx_Finalize +rx_GetCachedConnection +rx_GetCall +rx_GetIFInfo +rx_GetSpecific +rx_Init +rx_InitHost +rx_KeyCreate +rx_NewCall +rx_NewConnection +rx_NewService +rx_PrintPeerStats +rx_PrintStats +rx_PrintTheseStats +rx_ReadProc +rx_ReleaseCachedConnection +rx_ServerProc +rx_SetSpecific +rx_StartServer +rx_WriteProc +rxevent_Init +rxevent_Post +rxkad_GetServerInfo +rxkad_NewClientSecurityObject +rxkad_NewServerSecurityObject +rxnull_NewClientSecurityObject +rxnull_NewServerSecurityObject +rxs_Release +time_to_life +tkt_CheckTimes +tkt_DecodeTicket +tkt_MakeTicket +xdrrx_create +hton_syserr_conv +rxkad_global_stats +rxkad_global_stats_lock +rxkad_stats_key +afs_com_err +afs_error_message +rx_socket +rxevent_debugFile +rx_debugFile +rx_connDeadTime +rx_maxReceiveSize +rx_UdpBufSize +rx_extraQuota +rx_extraPackets +rx_tranquil +rx_getAllAddr +rx_nWaiting +rx_SetNoJumbo +rx_SetConnDeadTime +rx_SetConnHardDeadTime +rx_SetConnIdleDeadTime +rx_FlushWrite +rx_thread_id_key +multi_Finalize +multi_Select +multi_Init +multi_Finalize_Ignore +afs_add_to_error_table +xdr_afsUUID +xdr_afs_int32 +xdr_afs_uint32 +xdr_afs_int64 +xdr_afs_uint64 +rx_IncrementTimeAndCount +rx_enable_stats +rx_GetServerDebug +rx_GetServerStats +rx_GetServerVersion +rx_GetServerConnections +rx_GetServerPeers +rx_RetrieveProcessRPCStats +rx_RetrievePeerRPCStats +rx_FreeRPCStats +rx_queryProcessRPCStats +rx_queryPeerRPCStats +rx_enableProcessRPCStats +rx_enablePeerRPCStats +rx_disableProcessRPCStats +rx_disablePeerRPCStats +RXSTATS_ExecuteRequest +RXSTATS_RetrieveProcessRPCStats +RXSTATS_RetrievePeerRPCStats +RXSTATS_QueryProcessRPCStats +RXSTATS_QueryPeerRPCStats +RXSTATS_EnableProcessRPCStats +RXSTATS_EnablePeerRPCStats +RXSTATS_DisableProcessRPCStats +RXSTATS_DisablePeerRPCStats +RXSTATS_QueryRPCStatsVersion +RXSTATS_ClearProcessRPCStats +RXSTATS_ClearPeerRPCStats +TM_GetTimeOfDay +FT_GetTimeOfDay +opr_strcompose +opr_stolower +opr_ucstring +opr_lcstring +opr_AssertionFailed +rx_GetLocalPeers +rx_GetMaxReceiveWindow +rx_GetMaxSendWindow +rx_SetMaxReceiveWindow +rx_SetMaxSendWindow +rx_GetMinPeerTimeout +rx_SetMinPeerTimeout +afs_xdr_alloc +afs_xdr_array +afs_xdr_bytes +afs_xdr_char +afs_xdr_u_char +afs_xdr_enum +afs_xdr_free +afs_xdr_int +afs_xdr_opaque +afs_xdr_short +afs_xdr_string +afs_xdr_vector +afs_xdr_pointer +afs_xdrmem_create +xdrlen_create +rxi_GetCallNumberVector +rxi_SetCallNumberVector +rxi_RoundUpPacket +rx_SlowReadPacket +rx_SlowWritePacket +rxi_Alloc +rxi_AllocDataBuf +rx_MyMaxSendSize +rxi_Free +rx_opaque_new +rx_opaque_alloc +rx_opaque_populate +rx_opaque_copy +rx_opaque_freeContents +rx_opaque_zeroFreeContents +rx_opaque_free +rx_opaque_zeroFree +rx_identity_match +rx_identity_populate +rx_identity_copy +rx_identity_copyContents +rx_identity_new +rx_identity_freeContents +rx_identity_free +rx_InterruptCall +rx_SetBusyChannelError +rx_PeerOf +rx_SecurityClassOf +rx_ServiceIdOf +rx_SecurityObjectOf +rx_ConnError +rx_ConnectionOf +rx_RecordCallStatistics +rx_KeepAliveOn +rx_KeepAliveOff +rx_ServiceOf +rx_GetSecurityData +rx_SetSecurityData +rx_GetConnectionId +rx_GetConnectionEpoch +rx_GetSecurityHeaderSize +rx_SetSecurityHeaderSize +rx_SetSecurityMaxTrailerSize +rx_HostOf +rx_PortOf diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index 2494264bf2..cf061a4434 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -22,7 +22,8 @@ LT_objs = waitkey.lo fasttime.lo lock.lo LT_deps = $(top_builddir)/src/opr/liboafs_opr.la LT_libs = $(MT_LIBS) -all: liboafs_lwpcompat.la ${TOP_LIBDIR}/liblwp.a depinstall +all: liboafs_lwpcompat.la libafsrpc_lwpcompat.la \ + ${TOP_LIBDIR}/liblwp.a depinstall depinstall: ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h @@ -52,6 +53,9 @@ liblwp.a: ${LIBOBJS} $(LT_objs) liboafs_lwpcompat.la: liboafs_lwpcompat.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_lwpcompat.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + # This is required so sgi_64+ does not try to build this file. process.s: @echo Nothing to be done for process.s diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 1f92502c85..44d676c359 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -12,9 +12,11 @@ include @TOP_OBJDIR@/src/config/Makefile.shared OPTMZ = ${PAM_OPTMZ} DBG = ${PAM_DBG} LIBS = ${TOP_LIBDIR}/libafsauthent_pic.a ${TOP_LIBDIR}/libafsrpc_pic.a \ + ${TOP_LIBDIR}/libopr_pic.a \ ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS} KLIBS = ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \ ${TOP_LIBDIR}/libafsrpc_pic.a \ + ${TOP_LIBDIR}/libopr_pic.a \ ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS} SHOBJS = afs_account.o afs_session.o afs_password.o \ afs_pam_msg.o afs_message.o AFS_component_version_number.o diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index 630f402345..0af5f5ae95 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -25,7 +25,8 @@ LT_libs = $(MT_LIBS) all: \ includes \ ${TOP_LIBDIR}/librx.a \ - liboafs_rx.la + liboafs_rx.la \ + libafsrpc_rx.la depinstall: includes @@ -46,6 +47,10 @@ librx.a: $(LT_objs) liboafs_rx.la: liboafs_rx.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +# Convenience libraries for libafsrpc and shlibafsrpc +libafsrpc_rx.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + CFLAGS_rx.lo = @CFLAGS_NOERROR@ # diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 093aa75e72..6351131b26 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -19,8 +19,7 @@ INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ rxkad_convert.h fcrypt.h v5gen.h LT_objs=rxkad_client.lo rxkad_server.lo rxkad_common.lo rxkad_errs.lo \ - fcrypt.lo crypt_conn.lo ticket.lo ticket5.lo crc.lo \ - AFS_component_version_number.lo + fcrypt.lo crypt_conn.lo ticket.lo ticket5.lo crc.lo LT_deps=$(top_builddir)/src/comerr/liboafs_comerr.la \ $(top_builddir)/src/rx/liboafs_rx.la \ @@ -37,7 +36,7 @@ fc_test_LIBS=\ ${TOP_LIBDIR}/liblwp.a \ ${TOP_LIBDIR}/libafsutil.a -all: ${TOP_LIBDIR}/librxkad.a liboafs_rxkad.la depinstall +all: ${TOP_LIBDIR}/librxkad.a liboafs_rxkad.la libafsrpc_rxkad.la depinstall test: fc_test @@ -78,6 +77,9 @@ librxkad.a: $(LT_objs) liboafs_rxkad.la: liboafs_rxkad.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_rxkad.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + CFLAGS_ticket5.lo = @CFLAGS_NOERROR@ crc.lo: crc.c ${INCLS} diff --git a/src/rxstat/Makefile.in b/src/rxstat/Makefile.in index b0c76f9636..9fb4a0db66 100644 --- a/src/rxstat/Makefile.in +++ b/src/rxstat/Makefile.in @@ -13,7 +13,8 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp LT_objs = rxstat.cs.lo rxstat.ss.lo rxstat.xdr.lo rxstat.lo LT_deps = $(top_builddir)/src/rx/liboafs_rx.la -all: depinstall liboafs_rxstat.la ${TOP_LIBDIR}/librxstat.a +all: depinstall liboafs_rxstat.la libafsrpc_rxstat.la \ + ${TOP_LIBDIR}/librxstat.a generated: \ Krxstat.cs.c Krxstat.ss.c Krxstat.xdr.c \ @@ -54,6 +55,9 @@ librxstat.a: $(LT_objs) liboafs_rxstat.la: liboafs_rxstat.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_rxstat.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + Krxstat.cs.c: rxstat.xg ${RXGEN} -x -k -C -o $@ ${srcdir}/rxstat.xg diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in deleted file mode 100644 index c4cfa37d89..0000000000 --- a/src/shlibafsrpc/Makefile.in +++ /dev/null @@ -1,355 +0,0 @@ -# API version. When something changes, increment as appropriate. -# Ignore at your own risk. -LIBAFSRPCMAJOR=1 -LIBAFSRPCMINOR=4 - -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html -# -# Portions Copyright (c) 2003 Apple Computer, Inc. - -# This is a pthread safe library containing rx, rxkad and des. - -srcdir=@srcdir@ -include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.shared - - -MODULE_CFLAGS=-DRXDEBUG - -SFLAGS=-P -I${TOP_INCDIR} - -RX = $(srcdir)/../rx -RXKAD = $(srcdir)/../rxkad -RXSTAT = $(srcdir)/../rxstat -FSINT = $(srcdir)/../fsint -COMERR = $(srcdir)/../comerr -UTIL = $(srcdir)/../util -OPR = $(srcdir)/../opr -SYS = ${srcdir}/../sys -LWP = ${srcdir}/../lwp - -SYSOBJS =\ - syscall.o - -UTILOBJS =\ - assert.o \ - casestrcpy.o \ - base64.o \ - rbtree.o - -COMERROBJS =\ - error_msg.o \ - et_name.o \ - com_err.o - -XDROBJS =\ - xdr.o \ - xdr_array.o \ - xdr_arrayn.o \ - xdr_rx.o \ - xdr_mem.o \ - xdr_len.o \ - xdr_int32.o \ - xdr_int64.o \ - xdr_afsuuid.o \ - xdr_update.o \ - xdr_refernce.o \ - AFS_component_version_number.o - -RXOBJS =\ - rx_event.o \ - rx_user.o \ - rx_pthread.o \ - rx.o \ - rx_null.o \ - rx_opaque.o \ - rx_conncache.o \ - rx_globals.o \ - rx_getaddr.o \ - rx_identity.o \ - rx_misc.o \ - rx_packet.o \ - rx_rdwr.o \ - rx_stats.o \ - rx_trace.o \ - rx_multi.o \ - rx_peer.o \ - rx_conn.o \ - rx_call.o - -RXSTATOBJS =\ - rxstat.o \ - rxstat.ss.o \ - rxstat.xdr.o \ - rxstat.cs.o - -FSINTOBJS =\ - afsint.cs.o \ - afsint.xdr.o \ - afscbint.cs.o \ - afscbint.xdr.o \ - afsaux.o - -RXKADOBJS =\ - rxkad_client.o \ - rxkad_server.o \ - rxkad_common.o \ - ticket.o \ - ticket5.o \ - crc.o \ - fcrypt.o \ - crypt_conn.o - -LWPOBJS = \ - fasttime.o - -LIBOBJS = \ - ${RXOBJS} \ - ${XDROBJS} \ - ${RXKADOBJS} \ - ${COMERROBJS} \ - ${UTILOBJS} \ - ${SYSOBJS} \ - ${RXSTATOBJS} \ - ${LWPOBJS} \ - ${FSINTOBJS} - -LIBAFSRPC = libafsrpc.${SHLIB_SUFFIX}.${LIBAFSRPCMAJOR}.${LIBAFSRPCMINOR} - -all: ${TOP_LIBDIR}/${LIBAFSRPC} ${TOP_LIBDIR}/libafsrpc_pic.a - -${TOP_LIBDIR}/${LIBAFSRPC}: ${LIBAFSRPC} - ../config/shlib-install -d ${TOP_LIBDIR} \ - -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} - -${TOP_LIBDIR}/libafsrpc_pic.a: libafsrpc_pic.a - ${INSTALL_DATA} libafsrpc_pic.a $@ - -install: ${LIBAFSRPC} libafsrpc_pic.a - ../config/shlib-install -d ${DESTDIR}${libdir} \ - -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} - ${INSTALL_DATA} libafsrpc_pic.a ${DESTDIR}${libdir}/libafsrpc_pic.a - -dest: ${LIBAFSRPC} libafsrpc_pic.a - ../config/shlib-install -d ${DEST}/lib \ - -l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} - ${INSTALL_DATA} libafsrpc_pic.a ${DEST}/lib/libafsrpc_pic.a - -${LIBAFSRPC}: ${LIBOBJS} libafsrpc.map - ../config/shlib-build -d $(srcdir) -l libafsrpc \ - -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR} -- \ - $(LDFLAGS_roken) $(LDFLAGS_hcrypto) \ - ${LIBOBJS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) - -libafsrpc_pic.a: ${LIBOBJS} - $(RM) -f $@ - $(AR) crv $@ ${LIBOBJS} - $(RANLIB) $@ - -rx_event.o: ${RX}/rx_event.c - $(AFS_CCRULE) $(RX)/rx_event.c - -rx_user.o: ${RX}/rx_user.c - $(AFS_CCRULE) $(RX)/rx_user.c - -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - -rx.o: ${RX}/rx.c - $(AFS_CCRULE) $(RX)/rx.c - -rx_conncache.o: ${RX}/rx_conncache.c - $(AFS_CCRULE) $(RX)/rx_conncache.c - -rx_call.o: ${RX}/rx_call.c - $(AFS_CCRULE) $(RX)/rx_call.c - -rx_conn.o: ${RX}/rx_conn.c - $(AFS_CCRULE) $(RX)/rx_conn.c - -rx_peer.o: ${RX}/rx_peer.c - $(AFS_CCRULE) $(RX)/rx_peer.c - -rx_null.o: ${RX}/rx_null.c - $(AFS_CCRULE) $(RX)/rx_null.c - -rx_opaque.o: ${RX}/rx_opaque.c - $(AFS_CCRULE) $(RX)/rx_opaque.c - -rx_globals.o: ${RX}/rx_globals.c - $(AFS_CCRULE) $(RX)/rx_globals.c - -rx_identity.o: ${RX}/rx_identity.c - $(AFS_CCRULE) $(RX)/rx_identity.c - -rx_getaddr.o: ${RX}/rx_getaddr.c - $(AFS_CCRULE) $(RX)/rx_getaddr.c - -rx_misc.o: ${RX}/rx_misc.c - $(AFS_CCRULE) $(RX)/rx_misc.c - -rx_packet.o: ${RX}/rx_packet.c - $(AFS_CCRULE) $(RX)/rx_packet.c - -rx_stats.o: ${RX}/rx_stats.c - $(AFS_CCRULE) $(RX)/rx_stats.c - -rx_rdwr.o: ${RX}/rx_rdwr.c - $(AFS_CCRULE) $(RX)/rx_rdwr.c - -rx_trace.o: ${RX}/rx_trace.c - $(AFS_CCRULE) $(RX)/rx_trace.c - -rx_multi.o: ${RX}/rx_multi.c - $(AFS_CCRULE) $(RX)/rx_multi.c - -rxkad_client.o: ${RXKAD}/rxkad_client.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_client.c - -rxkad_server.o: ${RXKAD}/rxkad_server.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_server.c - -rxkad_common.o: ${RXKAD}/rxkad_common.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/rxkad_common.c - -ticket.o: ${RXKAD}/ticket.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/ticket.c - -CFLAGS_ticket5.o = @CFLAGS_NOERROR@ -ticket5.o: ${RXKAD}/ticket5.c - $(AFS_CCRULE) -I../rxkad -I$(RXKAD) $(RXKAD)/ticket5.c - -crc.o: ${RXKAD}/crc.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/crc.c - -fcrypt.o: ${RXKAD}/fcrypt.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/fcrypt.c - -crypt_conn.o: ${RXKAD}/crypt_conn.c - $(AFS_CCRULE) -I../rxkad $(RXKAD)/crypt_conn.c - -AFS_component_version_number.o: ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rx/AFS_component_version_number.c - -xdr.o: ${RX}/xdr.c - $(AFS_CCRULE) $(RX)/xdr.c - -xdr_int32.o: ${RX}/xdr_int32.c - $(AFS_CCRULE) $(RX)/xdr_int32.c - -xdr_int64.o: ${RX}/xdr_int64.c - $(AFS_CCRULE) $(RX)/xdr_int64.c - -xdr_array.o: ${RX}/xdr_array.c - $(AFS_CCRULE) $(RX)/xdr_array.c - -xdr_arrayn.o: ${RX}/xdr_arrayn.c - $(AFS_CCRULE) $(RX)/xdr_arrayn.c - -xdr_float.o: ${RX}/xdr_float.c - $(AFS_CCRULE) $(RX)/xdr_float.c - -xdr_len.o: ${RX}/xdr_len.c - $(AFS_CCRULE) $(RX)/xdr_len.c - -xdr_mem.o: ${RX}/xdr_mem.c - $(AFS_CCRULE) $(RX)/xdr_mem.c - -xdr_rec.o: ${RX}/xdr_rec.c - $(AFS_CCRULE) $(RX)/xdr_rec.c - -xdr_refernce.o: ${RX}/xdr_refernce.c - $(AFS_CCRULE) $(RX)/xdr_refernce.c - -xdr_rx.o: ${RX}/xdr_rx.c - $(AFS_CCRULE) $(RX)/xdr_rx.c - -xdr_update.o: ${RX}/xdr_update.c - $(AFS_CCRULE) $(RX)/xdr_update.c - -xdr_afsuuid.o: ${RX}/xdr_afsuuid.c - $(AFS_CCRULE) $(RX)/xdr_afsuuid.c - -error_msg.o: ${COMERR}/error_msg.c - $(AFS_CCRULE) $(COMERR)/error_msg.c - -et_name.o: ${COMERR}/et_name.c - $(AFS_CCRULE) $(COMERR)/et_name.c - -com_err.o: ${COMERR}/com_err.c - $(AFS_CCRULE) $(COMERR)/com_err.c - -casestrcpy.o: ${OPR}/casestrcpy.c - $(AFS_CCRULE) $(OPR)/casestrcpy.c - -assert.o: ${OPR}/assert.c - $(AFS_CCRULE) $(OPR)/assert.c - -rbtree.o: ${OPR}/rbtree.c - $(AFS_CCRULE) $(OPR)/rbtree.c - -base64.o: ${UTIL}/base64.c - $(AFS_CCRULE) $(UTIL)/base64.c - -fasttime.o: ${LWP}/fasttime.c - $(AFS_CCRULE) $(LWP)/fasttime.c - -syscall.o: ${SYS}/syscall.s - case "$(SYS_NAME)" in \ - sun4x_5* | sunx86_5*) \ - $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ - ${AS} ${ASFLAGS} -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - arm_darwin_* ) \ - touch syscall.c ; \ - ${CC} ${AFS_CFLAGS} -c syscall.c;; \ - sgi_* | *_darwin_* ) \ - ${CC} ${AFS_CFLAGS} -c ${SYS}/syscall.s;; \ - alpha_dux?? ) \ - ${AS} -P ${AFS_CFLAGS} -D_NO_PROTO -DMACH -DOSF -nostdinc -traditional -DASSEMBLER ${SYS}/syscall.s; \ - ${AS} -o syscall.o syscall.i; \ - $(RM) -f syscall.ss syscall.i;; \ - *fbsd* ) \ - touch syscall.c ; \ - ${CC} ${AFS_CFLAGS} -c syscall.c;; \ - *) \ - $(PATH_CPP) ${SFLAGS} ${SYS}/syscall.s > syscall.ss; \ - as $(ASFLAGS) -o syscall.o syscall.ss; \ - $(RM) syscall.ss;; \ - esac - -rxstat.o: ${RXSTAT}/rxstat.c - $(AFS_CCRULE) $(RXSTAT)/rxstat.c - -rxstat.cs.o: ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.cs.c - -rxstat.ss.o: ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.ss.c - -rxstat.xdr.o: ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/rxstat/rxstat.xdr.c - -afsint.cs.o: ${TOP_OBJDIR}/src/fsint/afsint.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.cs.c - -afsint.xdr.o: ${TOP_OBJDIR}/src/fsint/afsint.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afsint.xdr.c - -afscbint.cs.o: ${TOP_OBJDIR}/src/fsint/afscbint.cs.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.cs.c - -afscbint.xdr.o: ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c - $(AFS_CCRULE) ${TOP_OBJDIR}/src/fsint/afscbint.xdr.c - -afsaux.o: ${FSINT}/afsaux.c - $(AFS_CCRULE) -I../fsint ${FSINT}/afsaux.c - -clean: - $(RM) -f *.o libafsrpc.a* libafsrpc.sl* libafsrpc.so* \ - libafsrpc_pic.a libafsrpc.dylib.* libafsrpc.exp diff --git a/src/shlibafsrpc/libafsrpc.map b/src/shlibafsrpc/libafsrpc.map deleted file mode 100755 index 95841c4e90..0000000000 --- a/src/shlibafsrpc/libafsrpc.map +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -{ - global: - ktohl; - life_to_time; - osi_AssertFailU; - osi_Panic; - rx_DestroyConnection; - rx_EndCall; - rx_Finalize; - rx_GetCachedConnection; - rx_GetCall; - rx_GetIFInfo; - rx_GetSpecific; - rx_Init; - rx_InitHost; - rx_KeyCreate; - rx_NewCall; - rx_NewConnection; - rx_NewService; - rx_PrintPeerStats; - rx_PrintStats; - rx_PrintTheseStats; - rx_ReadProc; - rx_ReleaseCachedConnection; - rx_ServerProc; - rx_SetSpecific; - rx_StartServer; - rx_WriteProc; - rxevent_Init; - rxevent_Post; - rxkad_GetServerInfo; - rxkad_NewClientSecurityObject; - rxkad_NewServerSecurityObject; - rxnull_NewClientSecurityObject; - rxnull_NewServerSecurityObject; - rxs_Release; - time_to_life; - tkt_CheckTimes; - tkt_DecodeTicket; - tkt_MakeTicket; - xdrrx_create; - hton_syserr_conv; - rxkad_global_stats; - rxkad_global_stats_lock; - rxkad_stats_key; - afs_com_err; - afs_error_message; - rx_socket; - rxevent_debugFile; - rx_debugFile; - rx_connDeadTime; - rx_maxReceiveSize; - rx_UdpBufSize; - rx_extraQuota; - rx_extraPackets; - rx_tranquil; - rx_getAllAddr; - rx_nWaiting; - rx_SetNoJumbo; - rx_SetConnDeadTime; - rx_SetConnHardDeadTime; - rx_SetConnIdleDeadTime; - rx_FlushWrite; - rx_thread_id_key; - multi_Finalize; - multi_Select; - multi_Init; - multi_Finalize_Ignore; - afs_add_to_error_table; - xdr_afsUUID; - xdr_afs_int32; - xdr_afs_uint32; - xdr_afs_int64; - xdr_afs_uint64; - rx_IncrementTimeAndCount; - rx_enable_stats; - rx_GetServerDebug; - rx_GetServerStats; - rx_GetServerVersion; - rx_GetServerConnections; - rx_GetServerPeers; - rx_RetrieveProcessRPCStats; - rx_RetrievePeerRPCStats; - rx_FreeRPCStats; - rx_queryProcessRPCStats; - rx_queryPeerRPCStats; - rx_enableProcessRPCStats; - rx_enablePeerRPCStats; - rx_disableProcessRPCStats; - rx_disablePeerRPCStats; - RXSTATS_ExecuteRequest; - RXSTATS_RetrieveProcessRPCStats; - RXSTATS_RetrievePeerRPCStats; - RXSTATS_QueryProcessRPCStats; - RXSTATS_QueryPeerRPCStats; - RXSTATS_EnableProcessRPCStats; - RXSTATS_EnablePeerRPCStats; - RXSTATS_DisableProcessRPCStats; - RXSTATS_DisablePeerRPCStats; - RXSTATS_QueryRPCStatsVersion; - RXSTATS_ClearProcessRPCStats; - RXSTATS_ClearPeerRPCStats; - TM_GetTimeOfDay; - FT_GetTimeOfDay; - opr_strcompose; - opr_stolower; - opr_ucstring; - opr_lcstring; - opr_AssertionFailed; - rx_GetLocalPeers; - rx_GetMaxReceiveWindow; - rx_GetMaxSendWindow; - rx_SetMaxReceiveWindow; - rx_SetMaxSendWindow; - rx_GetMinPeerTimeout; - rx_SetMinPeerTimeout; - afs_xdr_alloc; - afs_xdr_array; - afs_xdr_bytes; - afs_xdr_char; - afs_xdr_u_char; - afs_xdr_enum; - afs_xdr_free; - afs_xdr_int; - afs_xdr_opaque; - afs_xdr_short; - afs_xdr_string; - afs_xdr_vector; - afs_xdr_pointer; - afs_xdrmem_create; - xdrlen_create; - rxi_GetCallNumberVector; - rxi_SetCallNumberVector; - rxi_RoundUpPacket; - rx_SlowReadPacket; - rx_SlowWritePacket; - rxi_Alloc; - rxi_AllocDataBuf; - rx_MyMaxSendSize; - rxi_Free; - rx_opaque_new; - rx_opaque_alloc; - rx_opaque_populate; - rx_opaque_copy; - rx_opaque_freeContents; - rx_opaque_zeroFreeContents; - rx_opaque_free; - rx_opaque_zeroFree; - rx_identity_match; - rx_identity_populate; - rx_identity_copy; - rx_identity_copyContents; - rx_identity_new; - rx_identity_freeContents; - rx_identity_free; - rx_InterruptCall; - rx_SetBusyChannelError; - rx_PeerOf; - rx_SecurityClassOf; - rx_ServiceIdOf; - rx_SecurityObjectOf; - rx_ConnError; - rx_ConnectionOf; - rx_RecordCallStatistics; - rx_KeepAliveOn; - rx_KeepAliveOff; - rx_ServiceOf; - rx_GetSecurityData; - rx_SetSecurityData; - rx_GetConnectionId; - rx_GetConnectionEpoch; - rx_GetSecurityHeaderSize; - rx_SetSecurityHeaderSize; - rx_SetSecurityMaxTrailerSize; - rx_HostOf; - rx_PortOf; - local: - *; -}; diff --git a/src/sys/.gitignore b/src/sys/.gitignore index f672d4f1f2..f714a73c0a 100644 --- a/src/sys/.gitignore +++ b/src/sys/.gitignore @@ -3,6 +3,7 @@ # to check that you haven't inadvertently ignored any tracked files. /rmtsys.h /rmtsysd +/syscall.c /afs.exp /afsl.exp /Krmtsys.h diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index fcca762acb..05cef0ca60 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -24,11 +24,12 @@ LIBS=libsys.a \ LT_objs = afssyscalls.lo setpag.lo pioctl.lo glue.lo \ rmtsysnet.lo rmtsysc.lo rmtsys.cs.lo rmtsys.xdr.lo rmtsys.ss.lo \ - rmtsyss.lo AFS_component_version_number.lo + rmtsyss.lo LT_deps = $(top_builddir)/src/rx/liboafs_rx.la all: \ liboafs_sys.la \ + libafsrpc_sys.la \ rmtsysd \ ${TOP_INCDIR}/afs/afssyscalls.h \ ${TOP_INCDIR}/afs/afs.exp \ @@ -90,14 +91,14 @@ depinstall: \ ${TOP_LIBDIR}/afs.exp \ ${KERNELDIR}/afs/xfsattrs.h \ ${UKERNELDIR}/afs/afsl.exp \ - Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h + Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c rmtsys.h libsys.a: $(LT_objs) afsl.exp @set -e; set -x; case "$(SYS_NAME)" in \ rs_aix*) \ - $(LT_LDLIB_lwp) $(LT_objs) afsl.exp ;; \ + $(LT_LDLIB_lwp) $(LT_objs) syscall.o afsl.exp ;; \ *) \ - $(LT_LDLIB_lwp) $(LT_objs) ;; \ + $(LT_LDLIB_lwp) $(LT_objs) syscall.o ;; \ esac # On AIX, liboafs_sys uses lsetpag() and lpioctl() which are syscall stubs, @@ -110,9 +111,12 @@ liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) ;; \ esac +libafsrpc_sys.la: syscall.lo + $(LT_LDLIB_pic) syscall.lo + tests: fixit iinc idec icreate iopen istat rmtsysd -syscall.o: syscall.s +syscall.lo: syscall.s @set -e; set -x; case "$(SYS_NAME)" in \ sgi_*) \ ${CC} ${AFS_CFLAGS} -c ${srcdir}/syscall.s; \ @@ -123,9 +127,12 @@ syscall.o: syscall.s $(RM) syscall.ss; \ ;; \ *) \ - touch syscall.o ; \ + touch syscall.c ; \ + $(CC) $(AFS_CFLAGS) -c syscall.c -o syscall.o; \ ;; \ - esac + esac ; \ + echo "# Generated by libtool (GNU libtool) 0.0.0\npic_object='syscall.o'\nnon_pic_object='syscall.o'" > syscall.lo + afssyscalls.lo: afssyscalls.c afssyscalls.h glue.lo: glue.c afssyscalls.h diff --git a/src/util/Makefile.in b/src/util/Makefile.in index bab7184eae..f669840468 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -12,7 +12,10 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp HELPER_SPLINT=@HELPER_SPLINT@ -LT_objs =base64.lo ktime.lo volparse.lo hostparse.lo exec.lo \ +LT_rpc_objs = base64.lo + +LT_objs =$(LT_rpc_objs) \ + ktime.lo volparse.lo hostparse.lo exec.lo \ hputil.lo kreltime.lo uuid.lo serverLog.lo \ dirpath.lo fileutil.lo flipbase64.lo fstab.lo \ afs_atomlist.lo afs_lhash.lo pthread_glock.lo tabular_output.lo \ @@ -45,7 +48,8 @@ all: ${includes} \ ${TOP_LIBDIR}/libafsutil.a \ ${TOP_LIBDIR}/libafsutil_pic.a \ sys \ - liboafs_util.la + liboafs_util.la \ + libafsrpc_util.la util.a: $(LT_objs) $(LT_LDLIB_lwp) $(LT_objs) @@ -56,6 +60,9 @@ libafsutil_pic.la: $(LT_objs) liboafs_util.la: liboafs_util.la.sym $(LT_objs) $(LT_deps) $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +libafsrpc_util.la: $(LT_rpc_objs) + $(LT_LDLIB_pic) $(LT_rpc_objs) + buildtools: ${TOP_LIBDIR}/libafsutil.a ${TOP_INCDIR}/afs/afsutil.h buildtools_clean: clean