Rationalise some #ifdefs in the LINUX osi layer
[openafs.git] / Makefile.in
index 026dc4d..244b97b 100644 (file)
@@ -15,6 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 # To compile AFS from scratch in the src tree run "make".
 #   This recursively calls "make install ..." and does not depend on the
@@ -63,6 +64,10 @@ dest_only_libafs: only_libafs dest_dirs
        $(MAKE) build TARGET=libafs COMPILE_PART2B=dest
        -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
+dpkg: dest
+       ln -fs ${srcdir}/src/packaging/Debian debian
+       dpkg-buildpackage -rfakeroot -us -uc
+
 packages: dest
        @case ${SYS_NAME} in \
        *_darwin_* ) \
@@ -93,6 +98,7 @@ install_dirs: force
        mkdir -p ${DESTDIR}${afssrvbindir}
        mkdir -p ${DESTDIR}${afssrvsbindir}
        mkdir -p ${DESTDIR}${afssrvlibexecdir}
+       mkdir -p ${DESTDIR}${afsdatadir}/C
 
 dest_dirs: force
        mkdir -p ${DEST}/bin
@@ -109,49 +115,49 @@ prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
 project: cmd comerr 
 
 tests: all 
-       ${COMPILE_PART1} tests ${COMPILE_PART2}
+       +${COMPILE_PART1} tests ${COMPILE_PART2}
 
 config: prelude
-       ${COMPILE_PART1} config ${COMPILE_PART2}
+       +${COMPILE_PART1} config ${COMPILE_PART2}
 
 procmgmt: config
-       ${COMPILE_PART1} procmgmt ${COMPILE_PART2}
+       +${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt des
-       ${COMPILE_PART1} util ${COMPILE_PART2}
+util: procmgmt des lwp_depinstall
+       +${COMPILE_PART1} util ${COMPILE_PART2}
 
 audit: util rx rxkad
-       ${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
+       +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
 
 comerr: util
-       ${COMPILE_PART1} comerr ${COMPILE_PART2}
+       +${COMPILE_PART1} comerr ${COMPILE_PART2}
 
 cmd: comerr
-       @case ${SYS_NAME} in \
-       sgi_6* | sun*_5[789] | sun*_510 | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \
+       +@case ${SYS_NAME} in \
+       sgi_6* | sun*_5[789] | sun*_51[01] | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \
        *) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \
        esac
 
 lwp: util lwp_depinstall
-       ${COMPILE_PART1} lwp ${COMPILE_PART2}
+       +${COMPILE_PART1} lwp ${COMPILE_PART2}
 
 rxgen: config
-       ${COMPILE_PART1} rxgen ${COMPILE_PART2}
+       +${COMPILE_PART1} rxgen ${COMPILE_PART2}
 
 rx: config lwp rxgen rx_depinstall
-       ${COMPILE_PART1} rx ${COMPILE_PART2}
+       +${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxstat: rx rxstat_depinstall
-       ${COMPILE_PART1} rxstat ${COMPILE_PART2}
+       +${COMPILE_PART1} rxstat ${COMPILE_PART2}
 
 rxtests: rxdebug
 rxdebug: rx sys
-       ${COMPILE_PART1} rxdebug ${COMPILE_PART2}
+       +${COMPILE_PART1} rxdebug ${COMPILE_PART2}
 
 fsint: cmd comerr rxgen rx lwp fsint_depinstall
-       ${COMPILE_PART1} fsint ${COMPILE_PART2}
+       +${COMPILE_PART1} fsint ${COMPILE_PART2}
 
 export2: project 
 
@@ -162,44 +168,68 @@ export:
        esac
 
 export_build: fsint
-       ${COMPILE_PART1} export ${COMPILE_PART2}
+       +${COMPILE_PART1} export ${COMPILE_PART2}
 
 afs: config export comerr afs_depinstall
-       ${COMPILE_PART1} afs ${COMPILE_PART2}
+       +${COMPILE_PART1} afs ${COMPILE_PART2}
 
 des: config
-       ${COMPILE_PART1} des ${COMPILE_PART2} 
+       +${COMPILE_PART1} des ${COMPILE_PART2}
+
+sys: cmd comerr afs des rx rxstat fsint auth sys_depinstall
+       +${COMPILE_PART1} sys ${COMPILE_PART2}
 
-sys: cmd comerr afs des rx rxstat fsint sys_depinstall
-       ${COMPILE_PART1} sys ${COMPILE_PART2}
+rxkad: cmd comerr des rx rxkad_depinstall
+       +${COMPILE_PART1} rxkad ${COMPILE_PART2}
 
-rxkad: cmd comerr sys des rx rxkad_depinstall
-       ${COMPILE_PART1} rxkad ${COMPILE_PART2}
+auth: cmd comerr comerr des lwp rx rxkad audit sys_depinstall auth_depinstall
+       +${COMPILE_PART1} auth ${COMPILE_PART2}
 
-auth: cmd comerr comerr des lwp rx sys rxkad audit auth_depinstall
-       ${COMPILE_PART1} auth ${COMPILE_PART2}
+ubik: cmd comerr auth ubik_depinstall sys
+       +${COMPILE_PART1} ubik ${COMPILE_PART2}
 
-ubik: cmd comerr auth ubik_depinstall
-       ${COMPILE_PART1} ubik ${COMPILE_PART2}
+tubik: ubik libafsrpc
+       [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT ubik for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tubik  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT ubik for ${SYS_NAME} ;; \
+       esac
 
 ubiktests: ubik
 
 ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall
-       ${COMPILE_PART1} ptserver ${COMPILE_PART2}
+       +${COMPILE_PART1} ptserver ${COMPILE_PART2}
+
+tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent
+       +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT ptserver for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tptserver  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT ptserver for ${SYS_NAME} ;; \
+       esac
 
-kauth: cmd comerr ubik cmd auth comerr ptserver audit libacl kauth_depinstall
-       ${COMPILE_PART1} kauth ${COMPILE_PART2}
+kauth: cmd comerr ubik cmd auth comerr ptserver audit libacl kauth_depinstall sys_depinstall
+       +${COMPILE_PART1} kauth ${COMPILE_PART2}
 
 libacl: cmd comerr ptserver libacl_depinstall
-       ${COMPILE_PART1} libacl ${COMPILE_PART2}
+       +${COMPILE_PART1} libacl ${COMPILE_PART2}
 
 dir: cmd comerr libacl dir_depinstall
-       ${COMPILE_PART1} dir ${COMPILE_PART2}
+       +${COMPILE_PART1} dir ${COMPILE_PART2}
 
 # Removed from sgi_* case below:
 # ${COMPILE_PART1} sgiefs ${COMPILE_PART2};;
 sgiefs:
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        sgi_*) \
                 echo "SGI efs not supported" ;; \
        *) \
@@ -207,10 +237,10 @@ sgiefs:
        esac
 
 vol: cmd comerr dir afs sgiefs
-       ${COMPILE_PART1} vol ${COMPILE_PART2}
+       +${COMPILE_PART1} vol ${COMPILE_PART2}
 
 tsalvaged: vol libafsrpc libafsauthent cmd util
-       set -x; \
+       +set -x; \
        if test "@DEMAND_ATTACH@" = "yes" ; then \
                case ${SYS_NAME} in \
                alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
@@ -228,13 +258,26 @@ tsalvaged: vol libafsrpc libafsauthent cmd util
 
 
 vlserver: cmd comerr vol audit vlserver_depinstall
-       ${COMPILE_PART1} vlserver ${COMPILE_PART2}
+       +${COMPILE_PART1} vlserver ${COMPILE_PART2}
+
+tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinstall
+       +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT tvlserver for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tvlserver  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT tvlserver for ${SYS_NAME} ;; \
+       esac
 
-viced: cmd comerr vlserver audit
-       ${COMPILE_PART1} viced ${COMPILE_PART2}
 
-tviced: cmd comerr viced vlserver libafsrpc libafsauthent
-       case ${SYS_NAME} in \
+viced: cmd comerr vlserver tvlserver audit
+       +${COMPILE_PART1} viced ${COMPILE_PART2}
+
+tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
                ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
@@ -246,53 +289,54 @@ tviced: cmd comerr viced vlserver libafsrpc libafsauthent
        esac
 
 volser: cmd comerr tviced usd kauth audit
-       ${COMPILE_PART1} volser ${COMPILE_PART2}
+       +${COMPILE_PART1} volser ${COMPILE_PART2}
 
 tvolser: project tviced usd libafsrpc libafsauthent volser
-       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
 
 venus: cmd comerr volser ptserver
-       ${COMPILE_PART1} venus ${COMPILE_PART2}
-       ${COMPILE_PART1} venus/test ${COMPILE_PART2}
+       +${COMPILE_PART1} venus ${COMPILE_PART2}
+       +${COMPILE_PART1} venus/test ${COMPILE_PART2}
 
 afsd: cmd comerr sys kauth
-       ${COMPILE_PART1} afsd ${COMPILE_PART2}
+       +${COMPILE_PART1} afsd ${COMPILE_PART2}
 
 gtx: cmd comerr auth kauth
-       ${COMPILE_PART1} gtx ${COMPILE_PART2}
+       +${COMPILE_PART1} gtx ${COMPILE_PART2}
 
 fsprobe: cmd comerr util fsint volser
-       ${COMPILE_PART1} fsprobe ${COMPILE_PART2}
+       +${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
 scout: cmd comerr gtx fsprobe
-       ${COMPILE_PART1} scout ${COMPILE_PART2}
+       +${COMPILE_PART1} scout ${COMPILE_PART2}
 
 uss: des kauth cmd comerr rx vlserver vol volser
-       ${COMPILE_PART1} uss ${COMPILE_PART2}
+       +${COMPILE_PART1} uss ${COMPILE_PART2}
 
 bozo: cmd comerr audit auth kauth volser
-       ${COMPILE_PART1} bozo ${COMPILE_PART2}
+       +${COMPILE_PART1} bozo ${COMPILE_PART2}
 
 vfsck: vol
-       set -x; \
+       +set -x; \
        case ${SYS_NAME} in \
-       sgi_* | *linux* | rs_aix42 | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* | rs_aix5* ) \
+       sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* ) \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac
 
-pam: cmd comerr kauth rxkad
-       set -x; \
+pam: auth shlibafsauthent shlibafsrpc
+       +set -x; \
        if test "@HAVE_PAM@" = "yes"; then \
                ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
        else \
@@ -300,7 +344,7 @@ pam: cmd comerr kauth rxkad
        fi
 
 tsm41: cmd comerr kauth rxkad
-       set -x; \
+       +set -x; \
        case ${SYS_NAME} in \
        rs_aix* ) \
                ${COMPILE_PART1} tsm41 ${COMPILE_PART2} ;; \
@@ -309,7 +353,7 @@ tsm41: cmd comerr kauth rxkad
        esac
 
 sgistuff: cmd comerr kauth rxkad
-       set -x; \
+       +set -x; \
        case ${SYS_NAME} in \
        sgi_* ) \
                ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
@@ -318,18 +362,20 @@ sgistuff: cmd comerr kauth rxkad
        esac
 
 aklog: comerr ptserver
-       set -x; \
+       +set -x; \
        if test "@BUILD_KRB5@" = "yes"; then \
                ${COMPILE_PART1} aklog ${COMPILE_PART2} ; \
        else \
                echo Skipping aklog for ${SYS_NAME} ; \
        fi
 
-platform: 
-       ${COMPILE_PART1} platform ${COMPILE_PART2}
+authtools: pam tsm41 sgistuff aklog
 
-man-pages:
-       if test -d "doc/man-pages" ; then \
+platform: config
+       +${COMPILE_PART1} platform ${COMPILE_PART2}
+
+man-pages: config
+       +if test -d "doc/man-pages" ; then \
                cd doc/man-pages ${COMPILE_PART2} ; \
        fi
 
@@ -339,46 +385,49 @@ man-pages:
 # encode dependencies within the _depinstall targets as required
 #
 lwp_depinstall: config
-       ${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL}
 
 rx_depinstall: config
-       ${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}
 
 rxkad_depinstall: config comerr
-       ${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}
 
 ubik_depinstall: config comerr rxgen
-       ${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL}
 
 vlserver_depinstall: config rxgen ubik_depinstall auth_depinstall
-       ${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}
+
+tvlserver_depinstall: config rxgen ubik_depinstall auth_depinstall
+       +${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL}
 
 auth_depinstall: config comerr
-       ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
 
 fsint_depinstall: config rxgen
-       ${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL}
 
 rxstat_depinstall: config rxgen
-       ${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL}
 
 libacl_depinstall: config
-       ${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL}
 
 afs_depinstall: config comerr
-       ${COMPILE_PART1} afs ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} afs ${COMPILE_DEPINSTALL}
 
 dir_depinstall: config
-       ${COMPILE_PART1} dir ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} dir ${COMPILE_DEPINSTALL}
 
-sys_depinstall: config
-       ${COMPILE_PART1} sys ${COMPILE_DEPINSTALL}
+sys_depinstall: config rxgen
+       +${COMPILE_PART1} sys ${COMPILE_DEPINSTALL}
 
 kauth_depinstall: config rxgen comerr
-       ${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL}
 
 ptserver_depinstall: config rxgen comerr
-       ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
+       +${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
 
 ${DEST}/bin/dedebug: dedebug
        ${INSTALL} $? $@
@@ -390,11 +439,11 @@ ${DEST}/bin/dedebug: dedebug
 libafs_setup: config export
        src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
 
-libafs: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall rxkad_depinstall fsint_depinstall \
+libafs: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
                libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall
-       ${COMPILE_PART1} libafs ${COMPILE_PART2}
+       +${COMPILE_PART1} libafs ${COMPILE_PART2}
 
-libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall rxkad_depinstall fsint_depinstall \
+libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
                libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall
        ${TOP_SRCDIR}/config/make_libafs_tree.pl \
                -sn $(SYS_NAME) \
@@ -414,11 +463,11 @@ UKERNELDIR= \
 libuafs_setup: config export
        src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
 
-libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \
+libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fsint_depinstall \
                auth_depinstall dir_depinstall libacl_depinstall rxkad_depinstall \
                ubik_depinstall afs_depinstall kauth_depinstall ptserver_depinstall \
                rxstat_depinstall lwp_depinstall sys_depinstall des
-       set -x; \
+       +set -x; \
        case ${SYS_NAME} in \
        hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
@@ -427,31 +476,31 @@ libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \
        esac
 
 afsweb: kauth
-       ${COMPILE_PART1} afsweb ${COMPILE_PART2}
+       +${COMPILE_PART1} afsweb ${COMPILE_PART2}
 
-update: cmd comerr auth
-       ${COMPILE_PART1} update ${COMPILE_PART2}
+update: cmd comerr auth sys
+       +${COMPILE_PART1} update ${COMPILE_PART2}
 
-log: cmd comerr auth 
-       ${COMPILE_PART1} log ${COMPILE_PART2}
+log: cmd comerr auth sys
+       +${COMPILE_PART1} log ${COMPILE_PART2}
 
 bu_utils: cmd comerr usd
-       ${COMPILE_PART1} bu_utils ${COMPILE_PART2}
+       +${COMPILE_PART1} bu_utils ${COMPILE_PART2}
 
 usd: cmd comerr
-       ${COMPILE_PART1} usd ${COMPILE_PART2}
+       +${COMPILE_PART1} usd ${COMPILE_PART2}
 
 bubasics: cmd comerr comerr rx
-       ${COMPILE_PART1} bubasics ${COMPILE_PART2}
+       +${COMPILE_PART1} bubasics ${COMPILE_PART2}
 
 butm: cmd comerr bubasics usd uss
-       ${COMPILE_PART1} butm ${COMPILE_PART2}
+       +${COMPILE_PART1} butm ${COMPILE_PART2}
 
 butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
-       ${COMPILE_PART1} butc ${COMPILE_PART2}
+       +${COMPILE_PART1} butc ${COMPILE_PART2}
 
 tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
        *) \
@@ -459,22 +508,34 @@ tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
        esac
 
 budb: cmd comerr bubasics uss
-       ${COMPILE_PART1} budb ${COMPILE_PART2}
+       +${COMPILE_PART1} budb ${COMPILE_PART2}
+
+tbudb: budb
+       +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tbudb ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT budb for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tbudb  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT budb for ${SYS_NAME} ;; \
+       esac
 
 bucoord: cmd comerr bubasics budb volser
-       ${COMPILE_PART1} bucoord ${COMPILE_PART2}
+       +${COMPILE_PART1} bucoord ${COMPILE_PART2}
 
 xstat: cmd comerr fsint viced
-       ${COMPILE_PART1} xstat ${COMPILE_PART2}
+       +${COMPILE_PART1} xstat ${COMPILE_PART2}
 
 afsmonitor: cmd comerr gtx xstat
-       ${COMPILE_PART1} afsmonitor ${COMPILE_PART2}
+       +${COMPILE_PART1} afsmonitor ${COMPILE_PART2}
 
 tests: rxtests ubiktests
 
 # pthread based user space RX library
 libafsrpc: rx rxkad des
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
        ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
@@ -486,7 +547,7 @@ libafsrpc: rx rxkad des
        esac
 
 libafsauthent: ubik auth kauth libafsrpc
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
        ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
@@ -499,38 +560,38 @@ libafsauthent: ubik auth kauth libafsrpc
 
 # pthread based user space RX library
 shlibafsrpc: rx rxkad des
-       case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*|*nbsd*|*obsd*|*fbsd*) \
        ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
        *) \
                echo Not building shared libafsrpc for ${SYS_NAME} ;; \
        esac
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
-       case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_1*|*nbsd*|*obsd*|*fbsd*) \
        ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
        *) \
                echo Not building shared libafsauthent for ${SYS_NAME} ;; \
        esac
 
 kopenafs: config sys
-       ${COMPILE_PART1} kopenafs ${COMPILE_PART2}
+       +${COMPILE_PART1} kopenafs ${COMPILE_PART2}
 
 libadmin_real: 
-       ${COMPILE_PART1} libadmin ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/vos ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/client ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/kas ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/pts ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/bos ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/cfg ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/test ${COMPILE_PART2}
-       ${COMPILE_PART1} libadmin/samples ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/vos ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/client ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/kas ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/pts ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/bos ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/cfg ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/test ${COMPILE_PART2}
+       +${COMPILE_PART1} libadmin/samples ${COMPILE_PART2}
 
 libadmin: libafsauthent bozo
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                        $(MAKE) libadmin_real ;; \
        *_darwin_[1-6][0-9]) \
@@ -542,7 +603,7 @@ libadmin: libafsauthent bozo
        esac
 
 libjafs: libadmin
-       case ${SYS_NAME} in \
+       +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux110) \
        ${COMPILE_PART1} JAVA/libjafs  ${COMPILE_PART2} ;; \
        *) \
@@ -555,19 +616,19 @@ jafs: libjafs
 
 jafsadm: libjafsadm
 
-finale: project cmd comerr afsd butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser tsalvaged \
+finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log \
+       ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \
        venus update xstat afsmonitor rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
-       platform kopenafs
-       ${COMPILE_PART1} finale ${COMPILE_PART2}
+       platform kopenafs authtools
+       +${COMPILE_PART1} finale ${COMPILE_PART2}
 
-finale_nolibafs: project cmd comerr afsd butc tbutc libuafs audit kauth log \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser tsalvaged \
+finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
        venus update xstat afsmonitor rxdebug libafsrpc \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
-       platform kopenafs
-       ${COMPILE_PART1} finale ${COMPILE_PART2}
+       platform kopenafs authtools
+       +${COMPILE_PART1} finale ${COMPILE_PART2}
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
 
@@ -610,12 +671,15 @@ clean2:
        -${COMPILE_PART1} rxkad ${COMPILE_CLEAN}
        -${COMPILE_PART1} auth ${COMPILE_CLEAN}
        -${COMPILE_PART1} ubik ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tubik ${COMPILE_CLEAN}
        -${COMPILE_PART1} ptserver ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tptserver ${COMPILE_CLEAN}
        -${COMPILE_PART1} kauth ${COMPILE_CLEAN}
        -${COMPILE_PART1} libacl ${COMPILE_CLEAN}
        -${COMPILE_PART1} dir ${COMPILE_CLEAN}
        -${COMPILE_PART1} vol ${COMPILE_CLEAN}
        -${COMPILE_PART1} vlserver ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tvlserver ${COMPILE_CLEAN}
        -${COMPILE_PART1} viced ${COMPILE_CLEAN}
        -${COMPILE_PART1} tviced ${COMPILE_CLEAN}
        -${COMPILE_PART1} volser ${COMPILE_CLEAN}
@@ -645,6 +709,7 @@ clean2:
        -${COMPILE_PART1} butc ${COMPILE_CLEAN}
        -${COMPILE_PART1} tbutc ${COMPILE_CLEAN}
        -${COMPILE_PART1} budb ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tbudb ${COMPILE_CLEAN}
        -${COMPILE_PART1} bucoord ${COMPILE_CLEAN}
        -${COMPILE_PART1} xstat ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsmonitor ${COMPILE_CLEAN}
@@ -655,6 +720,7 @@ clean2:
        -${COMPILE_PART1} shlibafsrpc ${COMPILE_CLEAN}
        -${COMPILE_PART1} shlibafsauthent ${COMPILE_CLEAN}
        -${COMPILE_PART1} kopenafs ${COMPILE_CLEAN}
+       -${COMPILE_PART1} platform ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin/adminutil ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin/client ${COMPILE_CLEAN}
@@ -678,7 +744,7 @@ clean2:
 distclean: clean
        /bin/rm -rf lib include
        /bin/rm -f config.log config.cache config.status \
-       src/config/afsconfig.h \
+       src/config/afsconfig.h src/config/stamp-h1 \
        Makefile \
        src/afs/Makefile \
        src/afsd/Makefile \
@@ -695,6 +761,7 @@ distclean: clean
        src/bubasics/Makefile \
        src/bucoord/Makefile \
        src/budb/Makefile \
+       src/tbudb/Makefile \
        src/butc/Makefile \
        src/butm/Makefile \
        src/cmd/test/Makefile \
@@ -734,6 +801,7 @@ distclean: clean
        src/libafs/Makefile \
        src/libafs/Makefile.common \
        src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+       src/libafs/afs.${MKAFS_OSTYPE}.plist \
        src/libafsauthent/Makefile \
        src/libafsrpc/Makefile \
        src/libuafs/Makefile \
@@ -749,6 +817,7 @@ distclean: clean
        src/procmgmt/Makefile \
        src/procmgmt/test/Makefile \
        src/ptserver/Makefile \
+       src/tptserver/Makefile \
        src/rx/Makefile \
        src/rx/bulk.example/Makefile \
        src/rx/bulktest/Makefile \
@@ -769,12 +838,12 @@ distclean: clean
        src/tbutc/Makefile \
        src/tests/Makefile \
        src/tests/run-tests \
-       src/tests/OpenAFS/Dirpath.pm \
        src/tsalvaged/Makefile \
        src/tsm41/Makefile \
        src/tviced/Makefile \
        src/tvolser/Makefile \
        src/ubik/Makefile \
+       src/tubik/Makefile \
        src/update/Makefile \
        src/usd/test/Makefile \
        src/usd/Makefile \
@@ -786,6 +855,7 @@ distclean: clean
        src/vfsck/Makefile \
        src/viced/Makefile \
        src/vlserver/Makefile \
+       src/tvlserver/Makefile \
        src/vol/Makefile \
        src/vol/test/Makefile \
        src/volser/Makefile \