From 848902bad11352cdd858d2d61db0601d3484dc12 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Thu, 25 Sep 2008 22:40:44 +0000
Subject: [PATCH] DEVEL15-pthread-ubik-volser-stupidity-20080925

LICENSE IPL10

make volserver build again for not pthreaded ubik


(cherry picked from commit 3f11790f6ab999be828fb0868b64ea00b98a5ea4)
---
 Makefile.in             | 13 +++++++------
 src/tvolser/Makefile.in | 16 ++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index dc8050d331..0bb4c0ecd1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -295,13 +295,14 @@ volser: cmd comerr tviced usd kauth audit
 	${COMPILE_PART1} volser ${COMPILE_PART2}
 
 tvolser: project tviced usd libafsrpc libafsauthent volser
-	[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in	\
-	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
-		${COMPILE_PART1} tvolser  ${COMPILE_PART2} ;;           \
-	*_darwin_[1-6][0-9])                                            \
+	@case ${SYS_NAME} in						\
+	*_darwin_[1-6][0-9])						\
 		echo Not building MT volser for ${SYS_NAME} ;;          \
-	*_darwin_*)                                                     \
-		${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
+	*_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
+		${COMPILE_PART1} tvolser ${COMPILE_PART2} ;             \
+		if [ "xyes" = "x$(ENABLE_PTHREADED_UNIK)" ] ; then	\
+			$(MAKE) $(COMPILE_PART2B)_vos;  					\
+		fi;;							\
 	*)                                                              \
 		echo Not building MT volser for ${SYS_NAME} ;;          \
 	esac
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 6897f3d895..9dee0d0577 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -57,11 +57,12 @@ 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 vos
+all: volserver 
 
+all_vos: vos
+	
 COMPILE=${CC} ${CFLAGS} -c $?
 
 rx_pthread.o: ${RX}/rx_pthread.c
@@ -221,8 +222,8 @@ vos.o: ${VOLSER}/vos.c
 	${COMPILE}
 
 
-vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS}
-	${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+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}
@@ -233,7 +234,9 @@ ${DEST}/root.server/usr/afs/bin/volserver: volserver
 ${DEST}/root.server/usr/afs/bin/vos: vos
 	${INSTALL} -ns $? $@
 
-install: ${DESTDIR}${afssrvlibexecdir}/volserver ${DESTDIR}${afssrvsbindir}/vos
+install: ${DESTDIR}${afssrvlibexecdir}/volserver 
+install_vos: ${DESTDIR}${afssrvsbindir}/vos
+
 clean:
 	$(RM) -f *.o volserver vos core AFS_component_version_number.c
 
@@ -245,5 +248,6 @@ ${DESTDIR}${afssrvlibexecdir}/volserver: volserver
 ${DESTDIR}${afssrvsbindir}/vos: vos
 	${INSTALL} -ns $? $@
 
-dest: ${DEST}/root.server/usr/afs/bin/volserver ${DEST}/root.server/usr/afs/bin/vos
+dest: ${DEST}/root.server/usr/afs/bin/volserver 
+dest_vos: ${DEST}/root.server/usr/afs/bin/vos