HELPER_SPLINT=@HELPER_SPLINT@
CC=${MT_CC}
-CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG
+CFLAGS=${COMMON_CFLAGS} -I.. -DNINTERFACE ${MT_CFLAGS} -DRXDEBUG -DFSSYNC_BUILD_CLIENT
CCRULE=${CC} ${CFLAGS} -c $?
VOL=../vol
FSINT=../fsint
VOLSER=../volser
+RX=../rx
VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o
-VLSERVEROBJS=#vldbint.cs.o vldbint.xdr.o
+VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
-LWPOBJS=lock.o fasttime.o threadname.o
+VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.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.o purge.o \
- clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o nuke.o
+VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \
+ clone.o devname.o common.o ihandle.o listinodes.o \
+ namei_ops.o nuke.o salvsync-client.o daemon_com.o
FSINTOBJS=# afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
-objects= ${VOLSEROBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
- ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS}
+RXOBJS=rx_pthread.o
+
+objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
+ ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
+
+vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
+ ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a
+LIBS= ${TOP_LIBDIR}/libcmd.a \
+ ${TOP_LIBDIR}/libafsauthent.a \
+ ${TOP_LIBDIR}/libafsrpc.a \
+ ${TOP_LIBDIR}/libafsutil.a \
+ ${TOP_LIBDIR}/libubik_pthread.a \
+ ${TOP_LIBDIR}/libusd.a
-all: volserver
+all: volserver vos
COMPILE=${CC} ${CFLAGS} -c $?
+rx_pthread.o: ${RX}/rx_pthread.c
+ ${COMPILE} -DDPF_FSLOG
volmain.o: ${VOLSER}/volmain.c
${COMPILE}
volprocs.o: ${VOLSER}/volprocs.c
${COMPILE}
volint.xdr.o: ${VOLSER}/volint.xdr.c
${COMPILE}
+vsprocs.o: ${VOLSER}/vsprocs.c
+ ${COMPILE}
+vsutils.o: ${VOLSER}/vsutils.c
+ ${COMPILE}
+lockprocs.o: ${VOLSER}/lockprocs.c
+ ${COMPILE}
assert.o: ${UTIL}/assert.c
${COMPILE}
lock.o: ${LWP}/lock.c
${COMPILE}
-fasttime.o: ${LWP}/fasttime.c
- ${COMPILE}
-
threadname.o: ${LWP}/threadname.c
${COMPILE}
netprocs.o: ${LIBACL}/netprocs.c
${COMPILE}
+vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
+ $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
+
+vl_errors.o: vl_errors.c
+ ${COMPILE}
+
vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
${COMPILE}
nuke.o: ${VOL}/nuke.c
${COMPILE}
-fssync.o: ${VOL}/fssync.c
+fssync-client.o: ${VOL}/fssync-client.c
+ ${COMPILE}
+
+salvsync-client.o: ${VOL}/salvsync-client.c
+ ${COMPILE}
+
+daemon_com.o: ${VOL}/daemon_com.c
${COMPILE}
purge.o: ${VOL}/purge.c
afsint.xdr.o: ${FSINT}/afsint.xdr.c
${COMPILE}
+vos.o: ${VOLSER}/vos.c
+ ${COMPILE}
+
+
+vos: vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS}
+ ${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+
volserver: ${objects} ${LIBS}
${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
${DEST}/root.server/usr/afs/bin/volserver: volserver
${INSTALL} -ns $? $@
-install: ${DESTDIR}${afssrvlibexecdir}/volserver
+${DEST}/root.server/usr/afs/bin/vos: vos
+ ${INSTALL} -ns $? $@
+install: ${DESTDIR}${afssrvlibexecdir}/volserver ${DESTDIR}${afssrvsbindir}/vos
clean:
- $(RM) -f *.o volserver core AFS_component_version_number.c
+ $(RM) -f *.o volserver vos core AFS_component_version_number.c
include ../config/Makefile.version
${DESTDIR}${afssrvlibexecdir}/volserver: volserver
${INSTALL} -ns $? $@
-dest: ${DEST}/root.server/usr/afs/bin/volserver
+${DESTDIR}${afssrvsbindir}/vos: vos
+ ${INSTALL} -ns $? $@
+
+dest: ${DEST}/root.server/usr/afs/bin/volserver ${DEST}/root.server/usr/afs/bin/vos