Build system: MT_LIBS includes XLIBS

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

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index ecbe87d..46575d7 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -14,19 +14,12 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 
 MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT
 
-RX=$(srcdir)/../rx
-VLSERVER=$(srcdir)/../vlserver
-LIBACL=$(srcdir)/../libacl
 DIR=$(srcdir)/../dir
 VOL=$(srcdir)/../vol
 
 VICEDOBJS=viced.o afsfileprocs.o host.o physio.o callback.o serialize_state.o \
          fsstats.o
 
-VLSERVEROBJS=vldbint.cs.o vldbint.xdr.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 \
@@ -35,13 +28,14 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \
 
 FSINTOBJS = afsint.ss.o
 
-RXOBJS = rx_pthread.o
-
-objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} \
-        ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+objects= ${VICEDOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a \
-     ${TOP_LIBDIR}/libafsrpc.a \
+LIBS= \
+     $(top_builddir)/src/vlserver/liboafs_vldb.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/libacl/liboafs_acl.la \
      $(top_builddir)/src/fsint/liboafs_fsint.la \
      $(top_builddir)/src/cmd/liboafs_cmd.la \
      $(top_builddir)/src/opr/liboafs_opr.la \
@@ -52,15 +46,15 @@ all: cbd fsprobe check_sysid fileserver ${TOP_INCDIR}/afs/fs_stats.h
 ${TOP_INCDIR}/afs/fs_stats.h: fs_stats.h
        ${INSTALL_DATA} $? $@
 
-check_sysid: check_sysid.c
-       ${CC} ${AFS_CFLAGS} ${AFS_LDFLAGS} -o check_sysid \
-               ${srcdir}/check_sysid.c
+check_sysid: check_sysid.o
+       $(LT_LDRULE_static) check_sysid.o \
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) ${XLIBS}
 
 fsprobe.o: fsprobe.c AFS_component_version_number.c
 
 fsprobe: fsprobe.o
        $(LT_LDRULE_static) fsprobe.o \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) ${XLIBS}
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS)
 
 CFLAGS_cbd.o = -DINTERPRET_DUMP
 cbd.o: callback.c AFS_component_version_number.c
@@ -69,20 +63,6 @@ cbd.o: callback.c AFS_component_version_number.c
 cbd: cbd.o
        $(LT_LDRULE_static) cbd.o ${LIBS} $(LIB_roken) ${XLIBS}
 
-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
 
@@ -148,7 +128,7 @@ afsint.ss.o: ../fsint/afsint.ss.c
 
 fileserver: ${objects} ${LIBS}
        $(LT_LDRULE_static) ${objects} \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS}
 
 install: fileserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}