cmd: Convert to using libtool

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

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index 07ef9ad..2fd25a9 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -17,7 +17,6 @@ MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_SERVER \
 
 RX=$(srcdir)/../rx
 VICED=$(srcdir)/../viced
-TVICED=$(srcdir)/../tviced
 VLSERVER=$(srcdir)/../vlserver
 LWP=$(srcdir)/../lwp
 LIBACL=$(srcdir)/../libacl
@@ -35,7 +34,7 @@ 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
+UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o volparse.o flipbase64.o softsig.o
 
 DIROBJS=buffer.o dir.o salvage.o
 
@@ -51,12 +50,12 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
 SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a \
-          ${TOP_LIBDIR}/libopr.a
+          $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
      ${TOP_LIBDIR}/libafsrpc.a \
-     $(TOP_LIBDIR)/libcmd.a \
-     ${TOP_LIBDIR}/libopr.a \
+     $(top_builddir)/src/cmd/liboafs_cmd.la \
+     $(top_builddir)/src/opr/liboafs_opr.la \
      ${TOP_LIBDIR}/util.a
 
 all: dafileserver state_analyzer
@@ -83,11 +82,8 @@ callback.o: ${VICED}/callback.c
 fsstats.o: ${VICED}/fsstats.c
        $(AFS_CCRULE) $(VICED)/fsstats.c
 
-serialize_state.o: ${TVICED}/serialize_state.c
-       $(AFS_CCRULE) $(TVICED)/serialize_state.c
-
-assert.o: ${UTIL}/assert.c
-       $(AFS_CCRULE) $(UTIL)/assert.c
+serialize_state.o: ${VICED}/serialize_state.c
+       $(AFS_CCRULE) $(VICED)/serialize_state.c
 
 uuid.o: ${UTIL}/uuid.c
        $(AFS_CCRULE) $(UTIL)/uuid.c
@@ -104,9 +100,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
 
@@ -214,21 +207,21 @@ afsint.ss.o: ../fsint/afsint.ss.c
 afsint.xdr.o: ../fsint/afsint.xdr.c
        $(AFS_CCRULE) ../fsint/afsint.xdr.c
 
-state_analyzer.o: ${TVICED}/state_analyzer.c
-       $(AFS_CCRULE) $(TVICED)/state_analyzer.c
+state_analyzer.o: ${VICED}/state_analyzer.c
+       $(AFS_CCRULE) $(VICED)/state_analyzer.c
 
 dafileserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
+       $(LT_LDRULE_static) ${objects} \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 state_analyzer: ${SDBGOBJS}
-       $(AFS_LDRULE) ${SDBGOBJS} \
+       $(LT_LDRULE_static) ${SDBGOBJS} \
                $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: dafileserver state_analyzer
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
-       ${INSTALL} dafileserver \
+       $(LT_INSTALL_PROGRAM) dafileserver \
                ${DESTDIR}${afssrvlibexecdir}/dafileserver
        ${INSTALL_PROGRAM} state_analyzer \
                ${DESTDIR}${afssrvsbindir}/state_analyzer
@@ -241,6 +234,7 @@ dest: dafileserver state_analyzer
                ${DEST}/root.server/usr/afs/bin/state_analyzer
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o dafileserver state_analyzer core AFS_component_version_number.c
 
 include ../config/Makefile.version