From b22b1ed356d885db04c0233bc82279ef6c8f40de Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 31 Aug 2012 12:18:21 +0100 Subject: [PATCH] Stop using libafsauthent Change-Id: Ieead3704e3210a1d88500ad1efa15bd2cad93bf6 Reviewed-on: http://gerrit.openafs.org/8098 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afsd/Makefile.in | 4 ++-- src/aklog/Makefile.in | 5 ++--- src/dviced/Makefile.in | 3 +-- src/dvolser/Makefile.in | 2 -- src/libafsauthent/Makefile.in | 1 + src/pam/Makefile.in | 3 ++- src/tbutc/Makefile.in | 5 ++++- src/tsalvaged/Makefile.in | 2 +- src/tvlserver/Makefile.in | 1 - src/venus/Makefile.in | 1 - src/viced/Makefile.in | 4 ++-- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in index a25ebf0ba..1986546a2 100644 --- a/src/afsd/Makefile.in +++ b/src/afsd/Makefile.in @@ -20,8 +20,8 @@ all: afsd vsys @ENABLE_FUSE_CLIENT@ # Programs # -AFSLIBS=$(top_builddir)/src/cmd/liboafs_cmd.la \ - ${TOP_LIBDIR}/libafsauthent.a \ +AFSLIBS=$(top_builddir)/src/auth/liboafs_auth.la \ + $(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/sys/liboafs_sys.la \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/opr/liboafs_opr.la diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index ba65471cd..12f1edd06 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -10,9 +10,8 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER AKLIBS= ${LIBS} $(LDFLAGS_krb5) $(LIB_krb5) -AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \ - ${TOP_LIBDIR}/libafshcrypto.a \ - $(top_builddir)/src/sys/liboafs_sys.la \ +AFSLIBS= ${TOP_LIBDIR}/libafshcrypto.a \ + $(top_builddir)/src/ptserver/liboafs_prot.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/opr/liboafs_opr.la \ diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index c0ed38c08..80955af74 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -37,8 +37,7 @@ SDBGOBJS = state_analyzer.o \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/opr/liboafs_opr.la -LIBS=${TOP_LIBDIR}/libafsauthent.a \ - $(top_builddir)/src/sys/liboafs_sys.la \ +LIBS= \ $(top_builddir)/src/vlserver/liboafs_vldb.la \ $(top_builddir)/src/libacl/liboafs_acl.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index 87c1dcb34..b9d03cf98 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -28,8 +28,6 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ objects= ${VOLSEROBJS} ${DIROBJS} ${VOLOBJS} LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ - ${TOP_LIBDIR}/libafsauthent.a \ - $(top_builddir)/src/sys/liboafs_sys.la \ $(top_builddir)/src/libacl/liboafs_acl.la \ $(top_builddir)/src/rx/liboafs_rx.la \ $(top_builddir)/src/rxstat/liboafs_rxstat.la \ diff --git a/src/libafsauthent/Makefile.in b/src/libafsauthent/Makefile.in index e1f748d45..a1d06a02b 100644 --- a/src/libafsauthent/Makefile.in +++ b/src/libafsauthent/Makefile.in @@ -23,6 +23,7 @@ LT_objs = \ $(top_builddir)/src/vlserver/libauthent_vlserver.la LT_deps = \ + $(top_builddir)/src/opr/liboafs_opr.la \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/libafsrpc/libafsrpc.la diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in index 44d676c35..6dce91bdf 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -12,10 +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 \ + ${TOP_LIBDIR}/libafsutil_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}/libafsutil_pic.a \ ${TOP_LIBDIR}/libopr_pic.a \ ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS} SHOBJS = afs_account.o afs_session.o afs_password.o \ diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in index 6bd61821f..e0886f8df 100644 --- a/src/tbutc/Makefile.in +++ b/src/tbutc/Makefile.in @@ -49,7 +49,10 @@ BUTCINCLUDE=-I. -I${TOP_INCDIR} BUTCLIBS=${TOP_LIBDIR}/libbudb.a \ ${TOP_LIBDIR}/libbubasics.a \ ${BUTMLIBS} \ - ${TOP_LIBDIR}/libafsauthent.a \ + $(top_builddir)/src/kauth/liboafs_kauth.la \ + $(top_builddir)/src/volser/liboafs_volser.la \ + $(top_builddir)/src/vlserver/liboafs_vldb.la \ + $(top_builddir)/src/ubik/liboafs_ubik.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \ $(top_builddir)/src/util/liboafs_util.la \ diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index c6ff2396a..ec1c308d8 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -44,7 +44,7 @@ FSSDEBUG_OBJS = fssync-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_builddir)/src/rx/liboafs_rx.la \ $(top_builddir)/src/util/liboafs_util.la \ $(top_builddir)/src/cmd/liboafs_cmd.la \ diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index 52655dfd6..0dd82b6c6 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -25,7 +25,6 @@ INCLS=${TOP_INCDIR}/ubik.h \ LIBS_common = \ $(top_builddir)/src/ubik/liboafs_ubik.la \ - ${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 \ diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 31fb07ec2..c78a80efe 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -25,7 +25,6 @@ AFSIO_INCLS=${TOP_INCDIR}/afs/afsint.h \ ${TOP_INCDIR}/afs/afsutil.h AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \ - ${TOP_LIBDIR}/libafsauthent.a \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/fsint/liboafs_fsint.la \ $(top_builddir)/src/vlserver/liboafs_vldb.la \ diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index 4d0cbc19d..f8c55e796 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -30,8 +30,8 @@ FSINTOBJS = afsint.ss.o objects= ${VICEDOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} -LIBS=${TOP_LIBDIR}/libafsauthent.a \ - $(top_builddir)/src/sys/liboafs_sys.la \ +LIBS= \ + $(top_builddir)/src/vlserver/liboafs_vldb.la \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \ $(top_builddir)/src/rxstat/liboafs_rxstat.la \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \ -- 2.39.5