Build system: MT_LIBS includes XLIBS

[openafs.git] / src / tbutc / Makefile.in

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index fc48dc1..b6f3ddf 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -16,7 +16,6 @@ BUTMINCLS   =${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 
 MODULE_CFLAGS = @XBSA_CFLAGS@ -I${BUCOORD} -I${VOLSER} -I../bucoord -I../volser
 
-LWP     = ${srcdir}/../lwp
 BUTM    = ${srcdir}/../butm
 BUTC    = ${srcdir}/../butc
 BUCOORD = ${srcdir}/../bucoord
@@ -26,13 +25,10 @@ BUCOORDOBJS=ubik_db_if.o ../bucoord/volstub.o ../bucoord/dlq.o \
            status.o ../bucoord/bucoord_errs.o
 
 VOLSEROBJS=vsprocs.o vsutils.o lockprocs.o
-VOLSERLIBS=${TOP_LIBDIR}/libvosadmin.a ${TOP_LIBDIR}/libafsadminutil.a
-
-LWPOBJS     =lock.o waitkey.o
 
 BUTCOBJS   =dbentries.o tcprocs.o lwps.o tcmain.o list.o recoverDb.o \
            tcudbprocs.o dump.o tcstatus.o butc_xbsa.o afsxbsa.o \
-            ${LWPOBJS} ${BUCOORDOBJS} ${VOLSEROBJS}
+            ${BUCOORDOBJS}
 
 BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
            ${TOP_INCDIR}/afs/volume.h \
@@ -51,14 +47,18 @@ BUTCINCLS=${TOP_INCDIR}/afs/partition.h \
 BUTCINCLUDE=-I. -I${TOP_INCDIR}
 BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libbubasics.a \
-           ${VOLSERLIBS} \
             ${BUTMLIBS} \
-           ${TOP_LIBDIR}/libafsauthent.a \
-           ${TOP_LIBDIR}/libafsrpc.a \
-            ${TOP_LIBDIR}/libcmd.a \
-           ${TOP_LIBDIR}/util.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 \
            $(top_builddir)/src/opr/liboafs_opr.la \
-           ${TOP_LIBDIR}/libusd.a \
+           $(top_builddir)/src/usd/liboafs_usd.la \
+           $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+           $(top_builddir)/src/sys/liboafs_sys.la \
            ${TOP_LIBDIR}/libprocmgmt.a
 
 #
@@ -69,7 +69,7 @@ all: butc
 
 butc: ${BUTCOBJS} ${BUTCLIBS}
        $(LT_LDRULE_static) ${BUTCOBJS} ${BUTCLIBS} \
-               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS}
 
 libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
        -$(RM) -f libbutm.a
@@ -125,12 +125,6 @@ vsprocs.o: ${VOLSER}/vsprocs.c
 lockprocs.o: ${VOLSER}/lockprocs.c
        $(AFS_CCRULE) ${VOLSER}/lockprocs.c
 
-lock.o: ${LWP}/lock.c
-       $(AFS_CCRULE) ${LWP}/lock.c
-
-waitkey.o: ${LWP}/waitkey.c
-       $(AFS_CCRULE) ${LWP}/waitkey.c
-
 file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
        $(AFS_CCRULE) ${BUTM}/file_tm.c