util: Convert to using libtool

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

diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index 98303d3..8d4664e 100644 (file)
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -9,19 +9,13 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 
-MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG \
-             -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
+MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
 
 VLSERVER=$(srcdir)/../vlserver
 LWP=$(srcdir)/../lwp
 LIBACL=$(srcdir)/../libacl
-UTIL=$(srcdir)/../util
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 VOLSER=$(srcdir)/../volser
@@ -35,8 +29,6 @@ LWPOBJS=lock.o threadname.o
 
 LIBACLOBJS=aclprocs.o netprocs.o
 
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
@@ -46,12 +38,13 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
 RXOBJS=rx_pthread.o
 
 objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${RXOBJS}
+        ${DIROBJS} ${VOLOBJS} ${RXOBJS}
 
-LIBS=  ${TOP_LIBDIR}/libcmd.a          \
+LIBS=  $(top_builddir)/src/cmd/liboafs_cmd.la          \
        ${TOP_LIBDIR}/libafsauthent.a   \
        ${TOP_LIBDIR}/libafsrpc.a       \
-       ${TOP_LIBDIR}/libafsutil.a      \
+       $(top_builddir)/src/util/liboafs_util.la        \
+       $(top_builddir)/src/opr/liboafs_opr.la          \
        ${TOP_LIBDIR}/libusd.a
 
 all: davolserver 
@@ -99,33 +92,6 @@ vsutils.o: ${VOLSER}/vsutils.c
 lockprocs.o: ${VOLSER}/lockprocs.c
        $(AFS_CCRULE) $(VOLSER)/lockprocs.c
 
-assert.o: ${UTIL}/assert.c
-       $(AFS_CCRULE) $(UTIL)/assert.c
-
-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) -I../util $(UTIL)/netutils.c
-
-dirpath.o: ${UTIL}/dirpath.c
-       $(AFS_CCRULE) $(UTIL)/dirpath.c
-
-softsig.o: ${UTIL}/softsig.c
-       $(AFS_CCRULE) $(UTIL)/softsig.c
-
 lock.o: ${LWP}/lock.c
        $(AFS_CCRULE) $(LWP)/lock.c
 
@@ -205,17 +171,20 @@ namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
 davolserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(LT_LDRULE_static) ${objects} ${LIBS} $(LIB_hcrypto) $(LIB_roken) \
+               ${MT_LIBS} ${XLIBS}
 
 install: davolserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL} davolserver ${DESTDIR}${afssrvlibexecdir}/davolserver
+       ${LT_INSTALL_PROGRAM} davolserver \
+               ${DESTDIR}${afssrvlibexecdir}/davolserver
 
 dest: davolserver
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL} davolserver ${DEST}/root.server/usr/afs/bin/davolserver
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o davolserver core AFS_component_version_number.c
 
 include ../config/Makefile.version