Build system: MT_LIBS includes XLIBS

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

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index eb44dfd..086dbe5 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -15,53 +15,41 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_SERVER \
              -DSALVSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS
 
-RX=$(srcdir)/../rx
 VICED=$(srcdir)/../viced
 VLSERVER=$(srcdir)/../vlserver
-LWP=$(srcdir)/../lwp
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
-FSINT=$(srcdir)/../fsint
 
 VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \
          fsstats.o
 
-VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o
-
-LWPOBJS=lock.o threadname.o
-
-LIBACLOBJS=aclprocs.o netprocs.o
-
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
         clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
         salvsync-client.o daemon_com.o vg_cache.o vg_scan.o
 
-FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
+FSINTOBJS= afsint.ss.o
 
-RXOBJS = rx_pthread.o 
-
-objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
-        ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
+objects= ${VICEDOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
 SDBGOBJS = state_analyzer.o \
           $(top_builddir)/src/util/liboafs_util.la \
           $(top_builddir)/src/opr/liboafs_opr.la
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
+LIBS= \
+     $(top_builddir)/src/vlserver/liboafs_vldb.la \
+     $(top_builddir)/src/libacl/liboafs_acl.la \
+     $(top_builddir)/src/rxkad/liboafs_rxkad.la \
+     $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+     $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+     $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
      $(top_builddir)/src/util/liboafs_util.la
 
 all: dafileserver state_analyzer
 
-CFLAGS_rx_pthread.o=-DDPF_FSLOG
-rx_pthread.o: ${RX}/rx_pthread.c
-       $(AFS_CCRULE) $(RX)/rx_pthread.c
-
 viced.o: ${VICED}/viced.c
        $(AFS_CCRULE) $(VICED)/viced.c
 
@@ -83,25 +71,6 @@ fsstats.o: ${VICED}/fsstats.c
 serialize_state.o: ${VICED}/serialize_state.c
        $(AFS_CCRULE) $(VICED)/serialize_state.c
 
-lock.o: ${LWP}/lock.c
-       $(AFS_CCRULE) $(LWP)/lock.c
-
-threadname.o: ${LWP}/threadname.c
-       $(AFS_CCRULE) $(LWP)/threadname.c
-
-aclprocs.o: ${LIBACL}/aclprocs.c
-       $(AFS_CCRULE) $(LIBACL)/aclprocs.c
-
-netprocs.o: ${LIBACL}/netprocs.c
-       $(AFS_CCRULE) $(LIBACL)/netprocs.c
-
-vldbint.cs.o: ../vlserver/vldbint.cs.c
-       $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
-
-vldbint.xdr.o: ../vlserver/vldbint.xdr.c
-       $(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.xdr.c
-
-
 buffer.o: ${DIR}/buffer.c
        $(AFS_CCRULE) $(DIR)/buffer.c
 
@@ -162,34 +131,18 @@ ihandle.o: ${VOL}/ihandle.c
 namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
-afsaux.o: ${FSINT}/afsaux.c
-       $(AFS_CCRULE) -I../fsint $(FSINT)/afsaux.c
-
-afscbint.cs.o: ../fsint/afscbint.cs.c
-       $(AFS_CCRULE) ../fsint/afscbint.cs.c
-
-afscbint.ss.o: ../fsint/afscbint.ss.c
-       $(AFS_CCRULE) ../fsint/afscbint.ss.c
-
-afsint.cs.o: ../fsint/afsint.cs.c
-       $(AFS_CCRULE) ../fsint/afsint.cs.c
-
 afsint.ss.o: ../fsint/afsint.ss.c
        $(AFS_CCRULE) ../fsint/afsint.ss.c
 
-afsint.xdr.o: ../fsint/afsint.xdr.c
-       $(AFS_CCRULE) ../fsint/afsint.xdr.c
-
 state_analyzer.o: ${VICED}/state_analyzer.c
        $(AFS_CCRULE) $(VICED)/state_analyzer.c
 
 dafileserver: ${objects} ${LIBS}
        $(LT_LDRULE_static) ${objects} \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS}
 
 state_analyzer: ${SDBGOBJS}
-       $(LT_LDRULE_static) ${SDBGOBJS} \
-               $(LIB_roken) ${MT_LIBS} ${XLIBS}
+       $(LT_LDRULE_static) ${SDBGOBJS} $(LIB_roken) ${MT_LIBS}
 
 install: dafileserver state_analyzer
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}