Make --enable-pthreaded-ubik do what it claims

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

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 59bb2a6..7c57bc7 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -9,13 +9,10 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
-MODULE_CFLAGS=-DNINTERFACE -DRXDEBUG -DFSSYNC_BUILD_CLIENT
+MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_CLIENT
 
 VLSERVER=$(srcdir)/../vlserver
 LWP=$(srcdir)/../lwp
@@ -54,13 +51,11 @@ vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
 
 LIBS=  ${TOP_LIBDIR}/libcmd.a          \
        ${TOP_LIBDIR}/libafsauthent.a   \
-       ${TOP_LIBDIR}/libafsrpc.a       \
        ${TOP_LIBDIR}/libafsutil.a      \
-       ${TOP_LIBDIR}/libusd.a
+       ${TOP_LIBDIR}/libusd.a          \
+       ${TOP_LIBDIR}/libafsrpc.a
 
-all: volserver 
-
-all_vos: vos
+all: volserver vos
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
 rx_pthread.o: ${RX}/rx_pthread.c
@@ -216,26 +211,28 @@ vos.o: ${VOLSER}/vos.c
 
 vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
        $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \
-               ${TOP_LIBDIR}/libubik_pthread.a ${MT_LIBS} ${XLIBS}
+               ${TOP_LIBDIR}/libubik_pthread.a \
+               $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 volserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) ${objects} \
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
-
-install_vos: vos
-       ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos
-       ${INSTALL} vos ${DESTDIR}${sbindir}/vos
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then     \
+           ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos      \
+           ${INSTALL} vos ${DESTDIR}${sbindir}/vos            \
+       fi
 
 dest: volserver
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL} volserver ${DEST}/root.server/usr/afs/bin/volserver
-
-dest_vos: vos
-       ${INSTALL} vos ${DEST}/root.server/usr/afs/bin/vos
-       ${INSTALL} vos ${DEST}/etc/vos
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
+           ${INSTALL} vos ${DEST}/root.server/usr/afs/bin/vos \
+           ${INSTALL} vos ${DEST}/etc/vos \
+       fi
 
 clean:
        $(RM) -f *.o volserver core AFS_component_version_number.c