cmd: Convert to using libtool

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

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 3ba9acb..76a523c 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -18,9 +18,9 @@ VLSERVER=$(srcdir)/../vlserver
 
 RXOBJS= rx_pthread.o rxkad_errs.o
 
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
+UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
      volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
-     get_krbrlm.o
+     pthread_threadname.o
 
 INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/lwp.h \
@@ -31,14 +31,22 @@ INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/afs/cellconfig.h \
        vlserver.h vldbint.h
 
-LIBS=  ${TOP_LIBDIR}/libubik_pthread.a \
+LIBS_common = \
+       ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libcmd.a \
+       $(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsrpc.a \
-       ${TOP_LIBDIR}/libafsutil.a 
+       ${TOP_LIBDIR}/libafsutil.a \
+       $(top_builddir)/src/opr/liboafs_opr.la
 
-OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS} 
+LIBS_server = \
+       ${TOP_LIBDIR}/libaudit.a \
+       $(LIBS_common)
 
+LIBS_client = \
+       $(LIBS_common)
+
+OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS}
 
 all: \
        vlserver vlclient vlserver cnvldb vldb_check \
@@ -58,9 +66,6 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 # pthreaded version of this library, as we are doing with ubik itself, but...
 #
 
-assert.o: ${UTIL}/assert.c
-       $(AFS_CCRULE) $(UTIL)/assert.c
-
 uuid.o: ${UTIL}/uuid.c
        $(AFS_CCRULE) $(UTIL)/uuid.c
 
@@ -76,9 +81,6 @@ volparse.o: ${UTIL}/volparse.c
 flipbase64.o: ${UTIL}/flipbase64.c
        $(AFS_CCRULE) $(UTIL)/flipbase64.c
 
-netutils.o: ${UTIL}/netutils.c
-       $(AFS_CCRULE) $(UTIL)/netutils.c
-
 dirpath.o: ${UTIL}/dirpath.c
        $(AFS_CCRULE) $(UTIL)/dirpath.c
 
@@ -91,40 +93,39 @@ hostparse.o: ${UTIL}/hostparse.c
 pthread_glock.o: ${UTIL}/pthread_glock.c
        $(AFS_CCRULE) $(UTIL)/pthread_glock.c
 
-get_krbrlm.o: ${UTIL}/get_krbrlm.c
-       $(AFS_CCRULE) $(UTIL)/get_krbrlm.c
+pthread_threadname.o: ${UTIL}/pthread_threadname.c
+       $(AFS_CCRULE) $(UTIL)/pthread_threadname.c
 
 #
 # Other stuff
 #
 
 
-vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
-       $(AFS_LDRULE) vldb_check.o AFS_component_version_number.o \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} 
+vldb_check: vldb_check.o AFS_component_version_number.o $(LIBS_client)
+       $(LT_LDRULE_static) vldb_check.o AFS_component_version_number.o \
+               $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
        $(AFS_CCRULE) $(VLSERVER)/vldb_check.c
 
-cnvldb: cnvldb.o ${LIBS} 
-       $(AFS_LDRULE) cnvldb.o \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+cnvldb: cnvldb.o $(LIBS_client)
+       $(LT_LDRULE_static) cnvldb.o \
+               $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
        $(AFS_CCRULE) $(VLSERVER)/cnvldb.c
 
-sascnvldb: sascnvldb.o ${LIBS} 
-       $(AFS_LDRULE) sascnvldb.o \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+sascnvldb: sascnvldb.o $(LIBS_client)
+       $(LT_LDRULE_static) sascnvldb.o \
+               $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
        $(AFS_CCRULE) $(VLSERVER)/sascnvldb.c
 
-vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
-       $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
+vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS_server)
+       $(LT_LDRULE_static) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                vldbint.xdr.o \
-               $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} \
-               ${TOP_LIBDIR}/libaudit.a
+               $(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
        $(AFS_CCRULE) $(VLSERVER)/vlserver.c
@@ -162,8 +163,8 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
-       $(AFS_LDRULE) vlclient.o $(OBJS) ${TOP_LIBDIR}/libcmd.a \
-               $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+       $(LT_LDRULE_static) vlclient.o $(OBJS) \
+               $(LIBS_server) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
                
 vlclient.o: ${VLSERVER}/vlclient.c
        $(AFS_CCRULE) $(VLSERVER)/vlclient.c
@@ -177,16 +178,22 @@ system: install
 
 install: vlserver cnvldb vldb_check
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
-               ${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver; \
-               ${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert; \
-               ${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check; \
+               $(LT_INSTALL_PROGRAM) vlserver \
+                       ${DESTDIR}${afssrvlibexecdir}/vlserver; \
+               $(LT_INSTALL_PROGRAM) cnvldb \
+                       ${DESTDIR}${afssrvsbindir}/vldb_convert; \
+               $(LT_INSTALL_PROGRAM) vldb_check \
+                       ${DESTDIR}${afssrvsbindir}/vldb_check; \
        fi
 
 dest: vlserver cnvldb vldb_check
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
-               ${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver; \
-               ${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert; \
-               ${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check; \
+               $(LT_INSTALL_PROGRAM) vlserver \
+                       ${DEST}/root.server/usr/afs/bin/vlserver; \
+               $(LT_INSTALL_PROGRAM) cnvldb \
+                       ${DEST}/etc/vldb_convert; \
+               $(LT_INSTALL_PROGRAM) vldb_check \
+                       ${DEST}/etc/vldb_check; \
        fi
 
 #
@@ -195,6 +202,7 @@ dest: vlserver cnvldb vldb_check
 include ../config/Makefile.version
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a *.otl *.xdr.c *.cs.c *.ss.c core \
                vlserver vlclient cnvldb vldbint.h vlserver.h vldb_check \
                vl_errors.c AFS_component_version_number.c