cmd: Convert to using libtool

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

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 8a21539..e1e6ee1 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -33,7 +33,7 @@ LWPOBJS=lock.o threadname.o
 
 LIBACLOBJS=aclprocs.o netprocs.o
 
-UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
+UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o pthread_threadname.o
 
 DIROBJS=buffer.o dir.o salvage.o
 
@@ -49,12 +49,20 @@ objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
 vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
        ${VOLOBJS} ${RXOBJS}
 
-LIBS=  ${TOP_LIBDIR}/libcmd.a          \
+LIBS_common = \
+       $(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsauthent.a   \
        ${TOP_LIBDIR}/libafsutil.a      \
        ${TOP_LIBDIR}/libusd.a          \
        ${TOP_LIBDIR}/libafsrpc.a       \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
+
+LIBS_client = \
+       $(TOP_LIBDIR)/libubik_pthread.a \
+       $(LIBS_common)
+
+LIBS_server = \
+       $(LIBS_common)
 
 all: volserver vos
 
@@ -116,9 +124,6 @@ volparse.o: ${UTIL}/volparse.c
 flipbase64.o: ${UTIL}/flipbase64.c
        $(AFS_CCRULE) $(UTIL)/flipbase64.c
 
-netutils.o: ${UTIL}/netutils.c
-       $(AFS_CCRULE) -I../util $(UTIL)/netutils.c
-
 dirpath.o: ${UTIL}/dirpath.c
        $(AFS_CCRULE) $(UTIL)/dirpath.c
 
@@ -210,21 +215,20 @@ namei_ops.o: ${VOL}/namei_ops.c
 vos.o: ${VOLSER}/vos.c
        $(AFS_CCRULE) -I../volser $(VOLSER)/vos.c
 
-vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
-       $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \
-               ${TOP_LIBDIR}/libubik_pthread.a \
+vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client)
+       $(LT_LDRULE_static) vos.o ${VOSOBJS} ${VLSERVEROBJS} $(LIBS_client) \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
-volserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+volserver: ${objects} $(LIBS_server)
+       $(LT_LDRULE_static) ${objects} $(LIBS_server) \
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
+       ${LT_INSTALL_PROGRAM} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then     \
-           ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos;     \
-           ${INSTALL} vos ${DESTDIR}${sbindir}/vos;           \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${afssrvsbindir}/vos;     \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${sbindir}/vos;           \
        fi
 
 dest: volserver
@@ -236,6 +240,7 @@ dest: volserver
        fi
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o volserver core AFS_component_version_number.c
 
 include ../config/Makefile.version