pthread-ubik-volser-stupidity-20080925
authorSimon Wilkinson <sxw@inf.ed.ac.uk>
Thu, 25 Sep 2008 22:40:25 +0000 (22:40 +0000)
committerDerrick Brashear <shadow@dementia.org>
Thu, 25 Sep 2008 22:40:25 +0000 (22:40 +0000)
LICENSE IPL10

make volserver build again for not pthreaded ubik

Makefile.in
src/tvolser/Makefile.in

index c03942d..5ba4e8c 100644 (file)
@@ -291,13 +291,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
index d21c257..0f614ff 100644 (file)
@@ -61,10 +61,11 @@ 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 $?
 
@@ -224,21 +225,25 @@ afsint.xdr.o: ${FSINT}/afsint.xdr.c
 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}
 
-install: volserver vos
+install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
+
+install_vos: vos
        ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos
        ${INSTALL} vos ${DESTDIR}${sbindir}/vos
 
-dest: volserver vos
+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