jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop using libafsrpc

Browse Source 
Instead of using libafsrpc.a in the pthreaded server directories,
use the libtool library variants instead.

Change-Id: I4cdbaf5a060b3e5aa82fb0d79535cb4fdc850bcf
Reviewed-on: http://gerrit.openafs.org/8074
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Simon Wilkinson 2012-08-22 13:13:15 +01:00 committed by Derrick Brashear
parent 8662592cae
commit 95f2b8f928
14 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/afsd/Makefile.in
View File

@ -22,9 +22,8 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@
AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \ AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libsys.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la
UAFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \ UAFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \

3
src/aklog/Makefile.in
View File

@ -11,8 +11,9 @@ MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER
AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5) AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5)
AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \ AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \
${TOP_LIBDIR}/libafshcrypto.a \ ${TOP_LIBDIR}/libafshcrypto.a \
$(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \
$(top_builddir)/src/util/liboafs_util.la $(top_builddir)/src/util/liboafs_util.la

6
src/dviced/Makefile.in
View File

@ -44,9 +44,11 @@ SDBGOBJS = state_analyzer.o \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la
LIBS=${TOP_LIBDIR}/libafsauthent.a \ LIBS=${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/fsint/liboafs_fsint.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/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/fsint/liboafs_fsint.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \
$(top_builddir)/src/util/liboafs_util.la $(top_builddir)/src/util/liboafs_util.la

5
src/dvolser/Makefile.in
View File

@ -36,7 +36,10 @@ objects= ${VOLSEROBJS} ${LIBACLOBJS} \
LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/rx/liboafs_rx.la \
$(top_builddir)/src/rxstat/liboafs_rxstat.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \

5
src/sys/Makefile.in
View File

@ -93,7 +93,7 @@ depinstall: \
${UKERNELDIR}/afs/afsl.exp \ ${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 libsys.a: $(LT_objs) afsl.exp syscall.lo
@set -e; set -x; case "$(SYS_NAME)" in \ @set -e; set -x; case "$(SYS_NAME)" in \
rs_aix*) \ rs_aix*) \
$(LT_LDLIB_lwp) $(LT_objs) syscall.o afsl.exp ;; \ $(LT_LDLIB_lwp) $(LT_objs) syscall.o afsl.exp ;; \
@ -106,7 +106,8 @@ libsys.a: $(LT_objs) afsl.exp
liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp liboafs_sys.la: liboafs_sys.la.sym $(LT_objs) $(LT_deps) afsl.exp
@set -e; set -x; case "$(SYS_NAME)" in \ @set -e; set -x; case "$(SYS_NAME)" in \
rs_aix*) \ rs_aix*) \
$(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;; \ $(LT_LDLIB_shlib) -Wl,-bI:afsl.exp $(LT_objs) $(LT_deps) ;\
$(AR) crv .libs/liboafs_sys.a ../sys/afsl.exp ;; \
*) \ *) \
$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) ;; \ $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) ;; \
esac esac

4
src/tbudb/Makefile.in
View File

@ -35,7 +35,9 @@ LIBS= \
${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/libbubasics.a \
${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \
$(top_builddir)/src/util/liboafs_util.la $(top_builddir)/src/util/liboafs_util.la

3
src/tbutc/Makefile.in
View File

@ -51,12 +51,13 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
${VOLSERLIBS} \ ${VOLSERLIBS} \
${BUTMLIBS} \ ${BUTMLIBS} \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \
$(top_builddir)/src/usd/liboafs_usd.la \ $(top_builddir)/src/usd/liboafs_usd.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/sys/liboafs_sys.la \
${TOP_LIBDIR}/libprocmgmt.a ${TOP_LIBDIR}/libprocmgmt.a
# #

6
src/tptserver/Makefile.in
View File

@ -30,7 +30,11 @@ INCLS=${TOP_INCDIR}/ubik.h \
LIBS_common= \ LIBS_common= \
${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/rx/liboafs_rx.la \
$(top_builddir)/src/rxstat/liboafs_rxstat.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la

2
src/tsalvaged/Makefile.in
View File

@ -45,7 +45,7 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS} SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
LIBS= ${TOP_LIBDIR}/libafsauthent.a \ LIBS= ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/rx/liboafs_rx.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \

5
src/tubik/Makefile.in
View File

@ -23,10 +23,11 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
${TOP_INCDIR}/lock.h ubik.h ubik_int.h utst_int.h ${TOP_INCDIR}/lock.h ubik.h ubik_int.h utst_int.h
LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ LIBS=${TOP_LIBDIR}/libafsauthent.a \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/comerr/liboafs_comerr.la \ $(top_builddir)/src/comerr/liboafs_comerr.la \
${top_builddir}/src/cmd/liboafs_cmd.la \ ${top_builddir}/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libsys.a \ $(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \
${XLIBS} ${MT_LIBS} ${XLIBS} ${MT_LIBS}

6
src/tvlserver/Makefile.in
View File

@ -26,8 +26,12 @@ INCLS=${TOP_INCDIR}/ubik.h \
LIBS_common = \ LIBS_common = \
${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libubik_pthread.a \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
$(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/rx/liboafs_rx.la \
$(top_builddir)/src/rxstat/liboafs_rxstat.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsrpc.a \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/libaudit.a \ ${TOP_LIBDIR}/libaudit.a \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la

6
src/tvolser/Makefile.in
View File

@ -41,11 +41,15 @@ vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \
${VOLOBJS} ${VOLOBJS}
LIBS_common = \ LIBS_common = \
$(top_builddir)/src/sys/liboafs_sys.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/usd/liboafs_usd.la \ $(top_builddir)/src/usd/liboafs_usd.la \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/rx/liboafs_rx.la \
$(top_builddir)/src/rxstat/liboafs_rxstat.la \
$(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/lwp/liboafs_lwpcompat.la \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la
LIBS_client = \ LIBS_client = \

3
src/venus/Makefile.in
View File

@ -26,7 +26,8 @@ AFSIO_INCLS=${TOP_INCDIR}/afs/afsint.h \
AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \
$(top_builddir)/src/fsint/liboafs_fsint.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/util/liboafs_util.la \
$(top_builddir)/src/opr/liboafs_opr.la $(top_builddir)/src/opr/liboafs_opr.la

5
src/viced/Makefile.in
View File

@ -38,7 +38,10 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
LIBS=${TOP_LIBDIR}/libafsauthent.a \ LIBS=${TOP_LIBDIR}/libafsauthent.a \
${TOP_LIBDIR}/libafsrpc.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/fsint/liboafs_fsint.la \ $(top_builddir)/src/fsint/liboafs_fsint.la \
$(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \
$(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/opr/liboafs_opr.la \