authcon: Use ktc_GetTokenEx in ClientAuthToken
[openafs.git] / Makefile.in
index 3de27bf..c347b6b 100644 (file)
@@ -30,19 +30,44 @@ COMPILE_PART2B = all
 COMPILE_PART2  = ${COMPILE_PART2A} ${COMPILE_PART2B}
 COMPILE_CLEAN  = ${COMPILE_PART2A} clean
 COMPILE_DEPINSTALL  = ${COMPILE_PART2A} depinstall
+COMPILE_GENERATED  = ${COMPILE_PART2A} generated
 
-all: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+all: force
        $(MAKE) build
 
-all_nolibafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+all_nolibafs: force
        $(MAKE) build TARGET=finale_nolibafs
 
-only_libafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+only_libafs: force
        $(MAKE) build TARGET=libafs
 
-only_libafs_tree: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+only_libafs_tree: force
        $(MAKE) build TARGET=libafs_tree
 
+buildtools: force
+       $(MAKE) build TARGET=build_tools COMPILE_PART2B=buildtools
+
+generated: force buildtools
+       +${COMPILE_PART1} afs ${COMPILE_GENERATED}
+       +${COMPILE_PART1} auth ${COMPILE_GENERATED}
+       +${COMPILE_PART1} bozo ${COMPILE_GENERATED}
+       +${COMPILE_PART1} bubasics ${COMPILE_GENERATED}
+       +${COMPILE_PART1} bucoord ${COMPILE_GENERATED}
+       +${COMPILE_PART1} budb ${COMPILE_GENERATED}
+       +${COMPILE_PART1} cmd ${COMPILE_GENERATED}
+       +${COMPILE_PART1} des ${COMPILE_GENERATED}
+       +${COMPILE_PART1} fsint ${COMPILE_GENERATED}
+       +${COMPILE_PART1} kauth ${COMPILE_GENERATED}
+       +${COMPILE_PART1} ptserver ${COMPILE_GENERATED}
+       +${COMPILE_PART1} rxkad ${COMPILE_GENERATED}
+       +${COMPILE_PART1} rxstat ${COMPILE_GENERATED}
+       +${COMPILE_PART1} sys ${COMPILE_GENERATED}
+       +${COMPILE_PART1} tests ${COMPILE_GENERATED}
+       +${COMPILE_PART1} ubik ${COMPILE_GENERATED}
+       +${COMPILE_PART1} update ${COMPILE_GENERATED}
+       +${COMPILE_PART1} vlserver ${COMPILE_GENERATED}
+       +${COMPILE_PART1} volser ${COMPILE_GENERATED}
+
 install: all install_dirs
        $(MAKE) build COMPILE_PART2B=install
 
@@ -64,9 +89,9 @@ dest_only_libafs: only_libafs dest_dirs
        $(MAKE) build TARGET=libafs COMPILE_PART2B=dest
        -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
-dpkg: dest
+dpkg:
        ln -fs ${srcdir}/src/packaging/Debian debian
-       dpkg-buildpackage -rfakeroot -us -uc
+       dpkg-buildpackage -rfakeroot -b -us -uc
 
 packages: dest
        @case ${SYS_NAME} in \
@@ -84,7 +109,7 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -98,6 +123,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,54 +135,57 @@ dest_dirs: force
        mkdir -p ${DEST}/root.server/etc
        mkdir -p ${DEST}/root.server/usr/afs/bin
 
-prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
+prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${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 lwp_depinstall
-       ${COMPILE_PART1} util ${COMPILE_PART2}
+util: procmgmt des lwp_depinstall rx_depinstall
+       +${COMPILE_PART1} util ${COMPILE_PART2}
 
-audit: util rx rxkad
-       ${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
+audit: util rx rxkad fsint
+       +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
 
 comerr: util
-       ${COMPILE_PART1} comerr ${COMPILE_PART2}
+       +${COMPILE_PART1} comerr ${COMPILE_PART2}
 
 cmd: comerr
-       @case ${SYS_NAME} in \
+       +@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
 
+hcrypto: config
+       +${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2}
+
 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 
 
@@ -167,28 +196,28 @@ 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 sys_depinstall
-       ${COMPILE_PART1} sys ${COMPILE_PART2}
+sys: cmd comerr afs des rx rxstat fsint auth sys_depinstall
+       +${COMPILE_PART1} sys ${COMPILE_PART2}
 
-rxkad: cmd comerr sys des rx rxkad_depinstall
-       ${COMPILE_PART1} rxkad ${COMPILE_PART2}
+rxkad: cmd comerr des rx rxkad_depinstall
+       +${COMPILE_PART1} rxkad ${COMPILE_PART2}
 
-auth: cmd comerr comerr des lwp rx sys rxkad audit auth_depinstall
-       ${COMPILE_PART1} auth ${COMPILE_PART2}
+auth: cmd comerr comerr des lwp rx rxkad audit sys_depinstall auth_depinstall
+       +${COMPILE_PART1} auth ${COMPILE_PART2}
 
-ubik: cmd comerr auth ubik_depinstall
-       ${COMPILE_PART1} ubik ${COMPILE_PART2}
+ubik: cmd comerr auth ubik_depinstall sys
+       +${COMPILE_PART1} ubik ${COMPILE_PART2}
 
 tubik: ubik libafsrpc
-       [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       +[ 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]) \
@@ -202,10 +231,10 @@ tubik: ubik libafsrpc
 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 \
+       +[ 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]) \
@@ -216,19 +245,19 @@ tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent
                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" ;; \
        *) \
@@ -236,31 +265,24 @@ 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; \
-       if test "@DEMAND_ATTACH@" = "yes" ; then \
-               case ${SYS_NAME} in \
-               alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
+       +case ${SYS_NAME} in \
+               alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*|*_darwin_*) \
                        ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \
-               *_darwin_[1-6][0-9]) \
-                       echo Not building MT tsalvaged for ${SYS_NAME} ;; \
                *_darwin_*) \
                        ${COMPILE_PART1} tsalvaged  ${COMPILE_PART2} ;; \
                *) \
                        echo Not building MT tsalvaged for ${SYS_NAME} ;; \
-               esac \
-       else \
-               echo skipping tsalvaged ; \
-       fi
+       esac
 
 
 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 \
+       +[ 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]) \
@@ -273,68 +295,79 @@ tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinsta
 
 
 viced: cmd comerr vlserver tvlserver audit
-       ${COMPILE_PART1} viced ${COMPILE_PART2}
+       +${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]*) \
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*|*_darwin_*) \
                ${COMPILE_PART1} tviced ${COMPILE_PART2} ;; \
-       *_darwin_[1-6][0-9]) \
-               echo Not building MT viced for ${SYS_NAME} ;; \
-       *_darwin_*) \
-               ${COMPILE_PART1} tviced  ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT viced for ${SYS_NAME} ;; \
        esac
 
+dviced: 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]*|*_darwin_*) \
+               ${COMPILE_PART1} dviced ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building DAFS viced for ${SYS_NAME} ;; \
+       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
-       [ 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])                                            \
-               echo Not building MT volser for ${SYS_NAME} ;;          \
-       *_darwin_*)                                                     \
-               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
+       +@case ${SYS_NAME} in                                           \
+       *_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
 
+dvolser: project tviced usd libafsrpc libafsauthent volser
+       +@case ${SYS_NAME} in                                           \
+       *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
+               ${COMPILE_PART1} dvolser ${COMPILE_PART2} ;;            \
+       *)                                                              \
+               echo Not building DAFS 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}
+afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@
+       +${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 \
@@ -342,7 +375,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} ;; \
@@ -351,7 +384,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} ;; \
@@ -359,19 +392,21 @@ sgistuff: cmd comerr kauth rxkad
                echo Skipping sgistuff for ${SYS_NAME} ;; \
        esac
 
-aklog: comerr ptserver
-       set -x; \
+aklog: auth comerr ptserver
+       +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
+
+platform: config cmd vol
+       +${COMPILE_PART1} platform ${COMPILE_PART2}
 
-man-pages:
-       if test -d "doc/man-pages" ; then \
+man-pages: config
+       +if test -d "doc/man-pages" ; then \
                cd doc/man-pages ${COMPILE_PART2} ; \
        fi
 
@@ -381,49 +416,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}
+       +${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL}
 
-auth_depinstall: config comerr
-       ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
+auth_depinstall: config rxgen comerr
+       +${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} $? $@
@@ -432,15 +467,13 @@ ${DEST}/bin/dedebug: dedebug
 #
 # libafs build targets
 #
-libafs_setup: config export
+libafs: config export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
+               libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall auth_depinstall
        src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
+       +${COMPILE_PART1} libafs ${COMPILE_PART2}
 
-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}
-
-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
+libafs_tree: export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_depinstall rxkad_depinstall fsint_depinstall \
+               libacl_depinstall afs_depinstall dir_depinstall rxstat_depinstall sys_depinstall auth_depinstall
        ${TOP_SRCDIR}/config/make_libafs_tree.pl \
                -sn $(SYS_NAME) \
                -os $(MKAFS_OSTYPE) \
@@ -462,8 +495,8 @@ libuafs_setup: config export
 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; \
+               rxstat_depinstall lwp_depinstall sys_depinstall des cmd
+       +set -x; \
        case ${SYS_NAME} in \
        hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
@@ -472,31 +505,31 @@ libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fs
        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} ;; \
        *) \
@@ -504,10 +537,10 @@ 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 \
+       +[ 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]) \
@@ -519,19 +552,19 @@ tbudb: budb
        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
+tests: rxtests ubiktests rpctestlib
 
 # 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]) \
@@ -543,7 +576,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]) \
@@ -556,38 +589,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]) \
@@ -599,7 +632,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} ;; \
        *) \
@@ -612,19 +645,27 @@ jafs: libjafs
 
 jafsadm: libjafsadm
 
+build_tools: config des comerr rxgen
+       +${COMPILE_PART1} util ${COMPILE_PART2A} buildtools_clean
+
 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 \
+       ptserver tptserver scout bu_utils ubik uss bozo @VFSCK@ volser tvolser tsalvaged \
+       dviced dvolser \
+       venus update xstat afsmonitor rxdebug libafsrpc hcrypto \
        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 tbudb libuafs audit kauth log \
-       ptserver tptserver scout bu_utils ubik tubik uss bozo vfsck volser tvolser tsalvaged \
-       venus update xstat afsmonitor rxdebug libafsrpc \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo @VFSCK@ volser tvolser tsalvaged \
+       dviced dvolser \
+       venus update xstat afsmonitor rxdebug libafsrpc hcrypto \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
-       platform kopenafs
-       ${COMPILE_PART1} finale ${COMPILE_PART2}
+       platform kopenafs authtools
+       +${COMPILE_PART1} finale ${COMPILE_PART2}
+
+check test: finale
+       cd tests && $(MAKE) check
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
 
@@ -678,8 +719,10 @@ clean2:
        -${COMPILE_PART1} tvlserver ${COMPILE_CLEAN}
        -${COMPILE_PART1} viced ${COMPILE_CLEAN}
        -${COMPILE_PART1} tviced ${COMPILE_CLEAN}
+       -${COMPILE_PART1} dviced ${COMPILE_CLEAN}
        -${COMPILE_PART1} volser ${COMPILE_CLEAN}
        -${COMPILE_PART1} tvolser ${COMPILE_CLEAN}
+       -${COMPILE_PART1} dvolser ${COMPILE_CLEAN}
        -${COMPILE_PART1} tsalvaged ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus/test ${COMPILE_CLEAN}
@@ -732,6 +775,7 @@ clean2:
        -${COMPILE_PART1} libafs ${COMPILE_CLEAN}
        -${COMPILE_PART1} libuafs ${COMPILE_CLEAN}
        -${COMPILE_PART1} tests ${COMPILE_CLEAN}
+       -${COMPILE_PART1} crypto/hcrypto ${COMPILE_CLEAN}
        -(cd src/libafs; /bin/rm -rf afs afsint config rx)
        -(cd src/libuafs; /bin/rm -rf afs afsint config rx des)
        -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} ${TOP_JLIBDIR}
@@ -741,18 +785,19 @@ distclean: clean
        /bin/rm -rf lib include
        /bin/rm -f config.log config.cache config.status \
        src/config/afsconfig.h src/config/stamp-h1 \
+       src/libafs/Makefile \
+       src/libuafs/Makefile \
        Makefile \
        src/afs/Makefile \
        src/afsd/Makefile \
-       src/afsd/afs.ppc_darwin.plist \
        src/afsmonitor/Makefile \
        src/afsweb/Makefile \
        src/aklog/Makefile \
        src/audit/Makefile \
-       src/auth/test/Makefile \
        src/auth/Makefile \
-       src/bozo/test/Makefile \
+       src/auth/test/Makefile \
        src/bozo/Makefile \
+       src/bozo/test/Makefile \
        src/bu_utils/Makefile \
        src/bubasics/Makefile \
        src/bucoord/Makefile \
@@ -760,56 +805,69 @@ distclean: clean
        src/tbudb/Makefile \
        src/butc/Makefile \
        src/butm/Makefile \
-       src/cmd/test/Makefile \
        src/cmd/Makefile \
-       src/comerr/test/Makefile \
+       src/cmd/test/Makefile \
        src/comerr/Makefile \
+       src/comerr/test/Makefile \
        src/config/Makefile \
+       src/config/Makefile.config \
        src/config/Makefile.version \
+       src/config/Makefile.version-CML \
        src/config/Makefile.version-NOCML \
-       src/config/Makefile.config \
-       src/des/test/Makefile \
+       src/config/shlib-build \
+       src/config/shlib-install \
+       src/crypto/hcrypto/Makefile \
        src/des/Makefile \
-       src/dir/test/Makefile \
+       src/des/test/Makefile \
        src/dir/Makefile \
+       src/dir/test/Makefile \
+       src/dviced/Makefile \
+       src/dvolser/Makefile \
        src/export/Makefile \
        src/finale/Makefile \
        src/fsint/Makefile \
        src/fsprobe/Makefile \
        src/gtx/Makefile \
-       src/kauth/test/Makefile \
+       src/JAVA/libjafs/Makefile \
        src/kauth/Makefile \
+       src/kauth/test/Makefile \
        src/kopenafs/Makefile \
-       src/libacl/test/Makefile \
        src/libacl/Makefile \
-       src/libadmin/adminutil/Makefile \
+       src/libacl/test/Makefile \
        src/libadmin/Makefile \
+       src/libadmin/adminutil/Makefile \
        src/libadmin/bos/Makefile \
-       src/libadmin/cfg/test/Makefile \
        src/libadmin/cfg/Makefile \
+       src/libadmin/cfg/test/Makefile \
        src/libadmin/client/Makefile \
        src/libadmin/kas/Makefile \
        src/libadmin/pts/Makefile \
        src/libadmin/samples/Makefile \
        src/libadmin/test/Makefile \
        src/libadmin/vos/Makefile \
-       src/JAVA/libjafs/Makefile \
-       src/libafs/Makefile \
        src/libafs/Makefile.common \
        src/libafs/MakefileProto.${MKAFS_OSTYPE} \
-       src/libafs/afs.${MKAFS_OSTYPE}.plist \
+       ${DARWIN_PLIST} \
        src/libafsauthent/Makefile \
        src/libafsrpc/Makefile \
-       src/libuafs/Makefile \
        src/libuafs/Makefile.common \
        src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
-       src/log/test/Makefile \
        src/log/Makefile \
-       src/lwp/test/Makefile \
+       src/log/test/Makefile \
        src/lwp/Makefile \
+       src/lwp/test/Makefile \
+       src/packaging/Debian/changelog \
+       src/packaging/MacOS/OpenAFS-debug.Description.plist \
+       src/packaging/MacOS/OpenAFS-debug.Info.plist \
+       src/packaging/MacOS/OpenAFS.Description.plist \
+       src/packaging/MacOS/OpenAFS.Info.plist \
+       src/packaging/MacOS/OpenAFS.info \
+       src/packaging/MacOS/buildpkg.sh \
+       src/packaging/RedHat/openafs.spec \
        src/pam/Makefile \
        src/platform/Makefile \
        src/platform/${MKAFS_OSTYPE}/Makefile \
+       src/platform/DARWIN/growlagent/Makefile \
        src/procmgmt/Makefile \
        src/procmgmt/test/Makefile \
        src/ptserver/Makefile \
@@ -829,7 +887,6 @@ distclean: clean
        src/sgistuff/Makefile \
        src/shlibafsauthent/Makefile \
        src/shlibafsrpc/Makefile \
-       src/sia/Makefile \
        src/sys/Makefile \
        src/tbutc/Makefile \
        src/tests/Makefile \
@@ -841,13 +898,13 @@ distclean: clean
        src/ubik/Makefile \
        src/tubik/Makefile \
        src/update/Makefile \
-       src/usd/test/Makefile \
        src/usd/Makefile \
+       src/usd/test/Makefile \
        src/uss/Makefile \
        src/util/Makefile \
        src/util/test/Makefile \
-       src/venus/test/Makefile \
        src/venus/Makefile \
+       src/venus/test/Makefile \
        src/vfsck/Makefile \
        src/viced/Makefile \
        src/vlserver/Makefile \
@@ -856,6 +913,9 @@ distclean: clean
        src/vol/test/Makefile \
        src/volser/Makefile \
        src/xstat/Makefile  \
+       tests/Makefile \
+       tests/rpctestlib/Makefile \
+       tests/tap/Makefile \
        src/helper-splint.sh
        if test -d doc/man-pages ; then \
            rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \