DEVEL15-volserver-split-volume-functionality-20090324

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

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index bfeb3a2..1546c7b 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -23,10 +23,13 @@ DIR=../dir
 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
+VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o vscommon.o vol_split.o
 
-VLSERVEROBJS=#vldbint.cs.o vldbint.xdr.o
+VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
+
+VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.o
 
 LWPOBJS=lock.o threadname.o
 
@@ -42,17 +45,32 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.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}/libusd.a
 
-all: volserver
+all: volserver 
 
+all_vos: vos
+       
 COMPILE=${CC} ${CFLAGS} -c $?
 
+rx_pthread.o: ${RX}/rx_pthread.c
+       ${COMPILE} -DDPF_FSLOG
 volmain.o: ${VOLSER}/volmain.c
        ${COMPILE}
+vol_split.o: ${VOLSER}/vol_split.c
+       ${COMPILE}
 volprocs.o: ${VOLSER}/volprocs.c
        ${COMPILE}
 physio.o: ${VOLSER}/physio.c
@@ -69,6 +87,12 @@ volint.ss.o: ${VOLSER}/volint.ss.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}
@@ -109,6 +133,12 @@ aclprocs.o: ${LIBACL}/aclprocs.c
 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}
 
@@ -190,21 +220,36 @@ afsint.ss.o: ${FSINT}/afsint.ss.c
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
        ${COMPILE}
 
+vos.o: ${VOLSER}/vos.c
+       ${COMPILE}
+
+
+vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
+       ${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a ${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 
+install_vos: ${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_vos: ${DEST}/root.server/usr/afs/bin/vos