util: Convert to using libtool
[openafs.git] / src / tvlserver / Makefile.in
index b05436b..d0c51e3 100644 (file)
@@ -13,15 +13,10 @@ HELPER_SPLINT=@HELPER_SPLINT@
 ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 RX=$(srcdir)/../rx
-UTIL=$(srcdir)/../util
 VLSERVER=$(srcdir)/../vlserver
 
 RXOBJS= rx_pthread.o rxkad_errs.o
 
-UTILOBJS=uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
-     volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o \
-     pthread_threadname.o get_krbrlm.o
-
 INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/lwp.h \
              ${TOP_INCDIR}/lock.h  \
@@ -31,15 +26,23 @@ 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}/libopr.a
+       $(top_builddir)/src/util/liboafs_util.la \
+       ${TOP_LIBDIR}/libaudit.a \
+       $(top_builddir)/src/opr/liboafs_opr.la
+
+LIBS_server = \
+       ${TOP_LIBDIR}/libaudit.a \
+       $(LIBS_common)
 
-OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS} 
+LIBS_client = \
+       $(LIBS_common)
 
+OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS}
 
 all: \
        vlserver vlclient vlserver cnvldb vldb_check \
@@ -53,79 +56,37 @@ rx_pthread.o: ${RX}/rx_pthread.c
 rxkad_errs.o: ../rxkad/rxkad_errs.c
        $(AFS_CCRULE) ../rxkad/rxkad_errs.c
 
-#
-# get the pthreaded util stuff compiled here.  we do this instead of
-# using the non-pthreaded libutil.a.  There probably should be a
-# pthreaded version of this library, as we are doing with ubik itself, but...
-#
-
-uuid.o: ${UTIL}/uuid.c
-       $(AFS_CCRULE) $(UTIL)/uuid.c
-
-serverLog.o: ${UTIL}/serverLog.c
-       $(AFS_CCRULE) $(UTIL)/serverLog.c
-
-fileutil.o: ${UTIL}/fileutil.c
-       $(AFS_CCRULE) $(UTIL)/fileutil.c
-
-volparse.o: ${UTIL}/volparse.c
-       $(AFS_CCRULE) $(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
-
-softsig.o: ${UTIL}/softsig.c
-       $(AFS_CCRULE) $(UTIL)/softsig.c
-
-hostparse.o: ${UTIL}/hostparse.c
-       $(AFS_CCRULE) $(UTIL)/hostparse.c
-
-pthread_glock.o: ${UTIL}/pthread_glock.c
-       $(AFS_CCRULE) $(UTIL)/pthread_glock.c
-
-pthread_threadname.o: ${UTIL}/pthread_threadname.c
-       $(AFS_CCRULE) $(UTIL)/pthread_threadname.c
-
-get_krbrlm.o: ${UTIL}/get_krbrlm.c
-       $(AFS_CCRULE) $(UTIL)/get_krbrlm.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
@@ -163,8 +124,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
@@ -178,16 +139,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
 
 #
@@ -196,6 +163,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