From c7774aa1177e4363db92d7c309263204093a440d Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Thu, 14 Apr 2005 03:13:50 +0000
Subject: [PATCH] tbutc-avoid-lwp-libs-20050413

FIXES 18225

stop using lwp family libs when building tbutc
---
 Makefile.in           |  2 +-
 src/tbutc/Makefile.in | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7c9d50e..9b5ac14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ butm: cmd comerr bubasics usd uss
 butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
 	${COMPILE_PART1} butc ${COMPILE_PART2}
 
-tbutc: cmd comerr bubasics butm budb bucoord cmd butc
+tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
 	case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
 		${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 1521b77..af7a097 100644
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -24,16 +24,14 @@ VOLSER  = ${srcdir}/../volser
 BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
 	    status.o ../bucoord/bucoord_errs.o
 
-VOLSERLIBOBJ=../volser/volint.cs.o  vsprocs.o ../volser/vsutils.o \
-            ../volser/lockprocs.o ../volser/volint.xdr.o ../volser/volerr.o \
-            ../volser/volint.ss.o  AFS_component_version_number.o 
-VOLSERLIBS  =libvolser.a
+VOLSEROBJS=vsprocs.o
+VOLSERLIBS=${TOP_LIBDIR}/libvosadmin.a ${TOP_LIBDIR}/libafsadminutil.a
 
 LWPOBJS     =lock.o
 
 BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
 	    tcudbprocs.o dump.o tcstatus.o butc_xbsa.o \
-            ${LWPOBJS} ${BUCOORDOBJS}
+            ${LWPOBJS} ${BUCOORDOBJS} ${VOLSEROBJS}
 
 BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
 	    ${TOP_INCDIR}/afs/volume.h \
@@ -54,14 +52,12 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 	    ${TOP_LIBDIR}/libbubasics.a \
 	    ${VOLSERLIBS} \
             ${BUTMLIBS} \
-	    ${TOP_LIBDIR}/libvldb.a \
 	    ${TOP_LIBDIR}/libafsauthent.a \
 	    ${TOP_LIBDIR}/libafsrpc.a \
             ${TOP_LIBDIR}/libcmd.a \
 	    ${TOP_LIBDIR}/util.a \
 	    ${TOP_LIBDIR}/libusd.a \
-	    ${TOP_LIBDIR}/libprocmgmt.a \
-	    ${TOP_LIBDIR}/librx.a
+	    ${TOP_LIBDIR}/libprocmgmt.a
 
 #
 # Build targets
@@ -72,11 +68,6 @@ all: butc
 butc: ${BUTCOBJS} ${BUTCLIBS}
 	${CC} ${CFLAGS} ${BUTCOBJS} ${BUTCLIBS} ${MT_LIBS} ${XLIBS} -o butc
 
-libvolser.a: vsprocs.o ${VOLSERLIBOBJ}
-	-$(RM) -f $@
-	$(AR) crv $@ vsprocs.o ${VOLSERLIBOBJ}
-	$(RANLIB) $@
-
 libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
 	-$(RM) -f libbutm.a
 	$(AR) crv libbutm.a $(BUTMOBJS) AFS_component_version_number.o
-- 
1.9.4