volser: Use libtool

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

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 983bf1d..6bd6182 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -7,6 +7,7 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 
@@ -16,7 +17,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 +26,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,13 +48,15 @@ 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_LIBDIR}/libusd.a \
+           $(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_builddir)/src/usd/liboafs_usd.la \
+           $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+           $(top_builddir)/src/sys/liboafs_sys.la \
            ${TOP_LIBDIR}/libprocmgmt.a
 
 #
@@ -67,7 +66,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 all: butc
 
 butc: ${BUTCOBJS} ${BUTCLIBS}
-       $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} \
+       $(LT_LDRULE_static) ${BUTCOBJS} ${BUTCLIBS} \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
@@ -96,6 +95,7 @@ list.o: ${BUTC}/list.c ${BUTCINCLS}
 recoverDb.o: ${BUTC}/recoverDb.c ${BUTCINCLS}
        $(AFS_CCRULE) ${BUTC}/recoverDb.c
 
+CFLAGS_tcudbprocs.o=@CFLAGS_NOERROR@
 tcudbprocs.o: ${BUTC}/tcudbprocs.c ${BUTCINCLS}
        $(AFS_CCRULE) ${BUTC}/tcudbprocs.c
 
@@ -123,12 +123,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
 
@@ -137,7 +131,7 @@ file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
 #
 install: butc
        ${INSTALL} -d ${DESTDIR}${sbindir}
-       ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc
+       $(LT_INSTALL_PROGRAM) butc ${DESTDIR}${sbindir}/butc
 
 dest: butc
        ${INSTALL} -d ${DEST}/etc
@@ -147,6 +141,7 @@ dest: butc
 # Misc targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a core AFS_component_version_number.c butc
 
 include ../config/Makefile.version