tubik-no-pinstall-on-head-20080612
[openafs.git] / Makefile.in
index 29483e5..abe2b80 100644 (file)
@@ -4,16 +4,18 @@
 # This software has been released under the terms of the IBM Public
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
+#
+# Portions Copyright (c) 2003 Apple Computer, Inc.
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-
-# Enable build+install of obsolete and insecure packages
-# Set to anything other than YES, or comment out to disable the build
-WITH_OBSOLETE=@WITH_OBSOLETE@
-WITH_INSECURE=@WITH_INSECURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+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
@@ -29,16 +31,16 @@ COMPILE_PART2  = ${COMPILE_PART2A} ${COMPILE_PART2B}
 COMPILE_CLEAN  = ${COMPILE_PART2A} clean
 COMPILE_DEPINSTALL  = ${COMPILE_PART2A} depinstall
 
-all: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+all: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
        $(MAKE) build
 
-all_nolibafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+all_nolibafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
        $(MAKE) build TARGET=finale_nolibafs
 
-only_libafs: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+only_libafs: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
        $(MAKE) build TARGET=libafs
 
-only_libafs_tree: force ${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR}
+only_libafs_tree: force ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR}
        $(MAKE) build TARGET=libafs_tree
 
 install: all install_dirs
@@ -52,14 +54,37 @@ install_only_libafs: only_libafs install_dirs
 
 dest: all dest_dirs
        $(MAKE) build COMPILE_PART2B=dest
+       -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
 dest_nolibafs: all_nolibafs dest_dirs
        $(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=dest
+       -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
 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
 
-${TOP_INCDIR} ${TOP_INCDIR}/afs ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+packages: dest
+       @case ${SYS_NAME} in \
+       *_darwin_* ) \
+               ${COMPILE_PART1} packaging/MacOS && sh ./buildpkg.sh ${DEST} ;; \
+       hp_ux110 ) \
+               ${COMPILE_PART1} packaging/HP-UX && swpackage -s  psf-1.2.10-transarc-paths-11.00 ;; \
+       hp_ux11i ) \
+               ${COMPILE_PART1} packaging/HP-UX && swpackage -s  psf-1.2.10-transarc-paths-11.11 ;; \
+       ia64_hpux1122 ) \
+               ${COMPILE_PART1} packaging/HP-UX && swpackage -s  psf-1.2.10-transarc-paths-11.22 ;; \
+       ia64_hpux1123 | hp_ux1123) \
+               ${COMPILE_PART1} packaging/HP-UX && swpackage -s  psf-1.2.10-transarc-paths-11.23 ;; \
+       *) \
+               echo Not building packages for ${SYS_NAME} ;; \
+       esac
+
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -84,21 +109,20 @@ 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}
+
 project: cmd comerr 
 
 tests: all 
        ${COMPILE_PART1} tests ${COMPILE_PART2}
 
-config: 
+config: prelude
        ${COMPILE_PART1} config ${COMPILE_PART2}
 
-pinstall: config
-       ${COMPILE_PART1} pinstall ${COMPILE_PART2}
-
-procmgmt: pinstall
+procmgmt: config
        ${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt
+util: procmgmt des lwp_depinstall
        ${COMPILE_PART1} util ${COMPILE_PART2}
 
 audit: util rx rxkad
@@ -109,7 +133,7 @@ comerr: util
 
 cmd: comerr
        @case ${SYS_NAME} in \
-       sgi_6* | sun*_5[789] | hp_ux11* | ia64_hpux* | sparc64_linux* | alpha_linux* ) \
+       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} ;; \
@@ -118,10 +142,10 @@ cmd: comerr
 lwp: util lwp_depinstall
        ${COMPILE_PART1} lwp ${COMPILE_PART2}
 
-rxgen: pinstall 
+rxgen: config
        ${COMPILE_PART1} rxgen ${COMPILE_PART2}
 
-rx: pinstall lwp rxgen rx_depinstall
+rx: config lwp rxgen rx_depinstall
        ${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxstat: rx rxstat_depinstall
@@ -145,13 +169,13 @@ export:
 export_build: fsint
        ${COMPILE_PART1} export ${COMPILE_PART2}
 
-afs: export pinstall comerr afs_depinstall
+afs: config export comerr afs_depinstall
        ${COMPILE_PART1} afs ${COMPILE_PART2}
 
-des: config pinstall
+des: config
        ${COMPILE_PART1} des ${COMPILE_PART2} 
 
-sys: cmd comerr afs des rx rxstat fsint
+sys: cmd comerr afs des rx rxstat fsint sys_depinstall
        ${COMPILE_PART1} sys ${COMPILE_PART2}
 
 rxkad: cmd comerr sys des rx rxkad_depinstall
@@ -163,17 +187,38 @@ auth: cmd comerr comerr des lwp rx sys rxkad audit auth_depinstall
 ubik: cmd comerr auth ubik_depinstall
        ${COMPILE_PART1} ubik ${COMPILE_PART2}
 
+tubik: ubik libafsrpc
+       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}
 
+tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent
+       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}
 
-dauth: cmd comerr ubik cmd auth kauth comerr
-       ${COMPILE_PART1} dauth ${COMPILE_PART2}
-
 libacl: cmd comerr ptserver libacl_depinstall
        ${COMPILE_PART1} libacl ${COMPILE_PART2}
 
@@ -193,16 +238,51 @@ sgiefs:
 vol: cmd comerr dir afs sgiefs
        ${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*) \
+                       ${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
+
+
 vlserver: cmd comerr vol audit vlserver_depinstall
        ${COMPILE_PART1} vlserver ${COMPILE_PART2}
 
-viced: cmd comerr vlserver audit
+tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinstall
+       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 tvlserver audit
        ${COMPILE_PART1} viced ${COMPILE_PART2}
 
-tviced: cmd comerr viced vlserver libafsrpc libafsauthent
+tviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
+       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]) \
+               echo Not building MT viced for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tviced  ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT viced for ${SYS_NAME} ;; \
        esac
@@ -210,6 +290,18 @@ tviced: cmd comerr viced vlserver libafsrpc libafsauthent
 volser: cmd comerr tviced usd kauth audit
        ${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])                                            \
+               echo Not building MT volser for ${SYS_NAME} ;;          \
+       *_darwin_*)                                                     \
+               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
+       *)                                                              \
+               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}
@@ -217,19 +309,7 @@ venus: cmd comerr volser ptserver
 afsd: cmd comerr sys kauth
        ${COMPILE_PART1} afsd ${COMPILE_PART2}
 
-null: cmd comerr
-       ${COMPILE_PART1} null ${COMPILE_PART2}
-
-${TOP_LIBDIR}/libtermlib.a: 
-       $(RM) -f ${TOP_LIBDIR}/libtermlib.a
-       case ${SYS_NAME} in \
-       rs_aix* | sun4x_* | sunx86_* | sgi_6? | *linux* | ppc_darwin* | *fbsd* | ia64_hpux*) \
-               ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a ;; \
-       *) \
-               ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \
-       esac
-
-gtx: cmd comerr null auth kauth ${TOP_LIBDIR}/libtermlib.a
+gtx: cmd comerr auth kauth
        ${COMPILE_PART1} gtx ${COMPILE_PART2}
 
 fsprobe: cmd comerr util fsint volser
@@ -241,90 +321,113 @@ scout: cmd comerr gtx fsprobe
 uss: des kauth cmd comerr rx vlserver vol volser
        ${COMPILE_PART1} uss ${COMPILE_PART2}
 
-bozo: cmd comerr ntp audit
+bozo: cmd comerr audit auth kauth volser
        ${COMPILE_PART1} bozo ${COMPILE_PART2}
 
 vfsck: vol
        set -x; \
        case ${SYS_NAME} in \
-       sgi_* | *linux* | rs_aix42 | ppc_darwin* | hp_ux* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* | rs_aix5* ) \
+       sgi_* | *linux* | rs_aix42 | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* | rs_aix5* ) \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac
 
-login: cmd comerr kauth rxkad
+pam: cmd comerr kauth rxkad
+       set -x; \
+       if test "@HAVE_PAM@" = "yes"; then \
+               ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
+       else \
+               echo Skipping pam for ${SYS_NAME} ; \
+       fi
+
+tsm41: cmd comerr kauth rxkad
+       set -x; \
+       case ${SYS_NAME} in \
+       rs_aix* ) \
+               ${COMPILE_PART1} tsm41 ${COMPILE_PART2} ;; \
+       * ) \
+               echo Skipping tsm41 for ${SYS_NAME} ;; \
+       esac
+
+sgistuff: cmd comerr kauth rxkad
        set -x; \
        case ${SYS_NAME} in \
        sgi_* ) \
                ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
-       rs_aix42 | rs_aix51 ) \
-               ${COMPILE_PART1} tsm41 ${COMPILE_PART2} ;; \
-       alpha_dux* ) \
-               ${COMPILE_PART1} sia ${COMPILE_PART2} ;; \
-       sun4x_55 ) \
-               ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
-       parisc_linux24) \
-               echo Skipping pam/login for parisc_linux24 ;; \
-       amd64_linux24) \
-               echo Skipping pam/login for amd64_linux24 ;; \
-       sun4x_* | sunx86_* | hp_ux11* | ia64_hpux* | *linux* | *fbsd* ) \
-               if test "@HAVE_PAM@" = "yes"; then \
-                       ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
-               else \
-                       echo Skipping pam for ${SYS_NAME} ; \
-               fi ;; \
-       ppc_darwin* | *_obsd* | *_nbsd* | hp_ux* | rs_aix5* ) \
-               echo Skipping login for ${SYS_NAME} ;; \
        * ) \
-               ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
+               echo Skipping sgistuff for ${SYS_NAME} ;; \
        esac
 
+aklog: 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}
+
+man-pages:
+       if test -d "doc/man-pages" ; then \
+               cd doc/man-pages ${COMPILE_PART2} ; \
+       fi
 
 #
 # _depinstall targets - only build and install headers/sources that are needed by libafs/libuafs
 #
 # encode dependencies within the _depinstall targets as required
 #
-lwp_depinstall: pinstall
+lwp_depinstall: config
        ${COMPILE_PART1} lwp ${COMPILE_DEPINSTALL}
 
-rx_depinstall: pinstall
+rx_depinstall: config
        ${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}
 
-rxkad_depinstall: pinstall comerr
+rxkad_depinstall: config comerr
        ${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}
 
-ubik_depinstall: pinstall comerr rxgen
+ubik_depinstall: config comerr rxgen
        ${COMPILE_PART1} ubik ${COMPILE_DEPINSTALL}
 
-vlserver_depinstall: pinstall rxgen ubik_depinstall auth_depinstall
+vlserver_depinstall: config rxgen ubik_depinstall auth_depinstall
        ${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}
 
-auth_depinstall: pinstall comerr
+tvlserver_depinstall: config rxgen ubik_depinstall auth_depinstall
+       ${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL}
+
+auth_depinstall: config comerr
        ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
 
-fsint_depinstall: pinstall rxgen
+fsint_depinstall: config rxgen
        ${COMPILE_PART1} fsint ${COMPILE_DEPINSTALL}
 
-rxstat_depinstall: pinstall rxgen
+rxstat_depinstall: config rxgen
        ${COMPILE_PART1} rxstat ${COMPILE_DEPINSTALL}
 
-libacl_depinstall: pinstall
+libacl_depinstall: config
        ${COMPILE_PART1} libacl ${COMPILE_DEPINSTALL}
 
-afs_depinstall: pinstall comerr
+afs_depinstall: config comerr
        ${COMPILE_PART1} afs ${COMPILE_DEPINSTALL}
 
-dir_depinstall: pinstall
+dir_depinstall: config
        ${COMPILE_PART1} dir ${COMPILE_DEPINSTALL}
 
-kauth_depinstall: pinstall rxgen comerr
+sys_depinstall: config
+       ${COMPILE_PART1} sys ${COMPILE_DEPINSTALL}
+
+kauth_depinstall: config rxgen comerr
        ${COMPILE_PART1} kauth ${COMPILE_DEPINSTALL}
 
-ptserver_depinstall: pinstall rxgen comerr
+ptserver_depinstall: config rxgen comerr
        ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
 
+${DEST}/bin/dedebug: dedebug
+       ${INSTALL} $? $@
+
 
 #
 # libafs build targets
@@ -332,12 +435,12 @@ ptserver_depinstall: pinstall rxgen comerr
 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 \
-               libacl_depinstall afs_depinstall dir_depinstall rxstat_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}
 
-libafs_tree: libafs_setup lwp_depinstall rx_depinstall vlserver_depinstall rxkad_depinstall fsint_depinstall \
-               libacl_depinstall afs_depinstall dir_depinstall rxstat_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) \
                -os $(MKAFS_OSTYPE) \
@@ -356,19 +459,19 @@ 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 des
+               rxstat_depinstall lwp_depinstall sys_depinstall des
        set -x; \
        case ${SYS_NAME} in \
-       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | ia64_hpux1122) \
+       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \
        esac
 
-afsweb: kauth dauth 
+afsweb: kauth
        ${COMPILE_PART1} afsweb ${COMPILE_PART2}
 
 update: cmd comerr auth
@@ -392,9 +495,9 @@ butm: cmd comerr bubasics usd uss
 butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
        ${COMPILE_PART1} butc ${COMPILE_PART2}
 
-tbutc: cmd comerr bubasics butm budb bucoord cmd butc
+tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix4*|*linux*|hp_ux11*|ia64_hpux*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT butc for ${SYS_NAME} ;; \
@@ -403,6 +506,18 @@ tbutc: cmd comerr bubasics butm budb bucoord cmd butc
 budb: cmd comerr bubasics uss
        ${COMPILE_PART1} budb ${COMPILE_PART2}
 
+tbudb: budb
+       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}
 
@@ -417,25 +532,31 @@ tests: rxtests ubiktests
 # pthread based user space RX library
 libafsrpc: rx rxkad des
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
+       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]) \
+               echo Not building MT libafsrpc for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} libafsrpc  ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
        esac
 
 libafsauthent: ubik auth kauth libafsrpc
        case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*) \
+       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]) \
+               echo Not building MT libafsauthent for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} libafsauthent  ${COMPILE_PART2} ;; \
        *) \
-               echo Not building MT libafsrpc for ${SYS_NAME} ;; \
+               echo Not building MT libafsauthent for ${SYS_NAME} ;; \
        esac
 
 # pthread based user space RX library
 shlibafsrpc: rx rxkad des
        case ${SYS_NAME} in \
-       amd64_linux24) \
-               echo Skipping shlibafsrpc for amd64_linux24 ;; \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
        ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
        *) \
@@ -444,14 +565,15 @@ shlibafsrpc: rx rxkad des
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
        case ${SYS_NAME} in \
-       amd64_linux24) \
-               echo Skipping shlibafsauthent for amd64_linux24 ;; \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
        ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
        *) \
-               echo Not building shared libafsrpc for ${SYS_NAME} ;; \
+               echo Not building shared libafsauthent for ${SYS_NAME} ;; \
        esac
 
+kopenafs: config sys
+       ${COMPILE_PART1} kopenafs ${COMPILE_PART2}
+
 libadmin_real: 
        ${COMPILE_PART1} libadmin ${COMPILE_PART2}
        ${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2}
@@ -468,6 +590,10 @@ libadmin: libafsauthent bozo
        case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                        $(MAKE) libadmin_real ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT libadmin for ${SYS_NAME} ;; \
+       *_darwin_*) \
+                       $(MAKE) libadmin_real ;; \
        *) \
                echo Not building MT libadmin for ${SYS_NAME} ;; \
        esac
@@ -486,16 +612,18 @@ jafs: libjafs
 
 jafsadm: libjafsadm
 
-finale: project cmd comerr afsd allrcmds butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser \
-       venus update xstat afsmonitor dauth rxdebug libafsrpc \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin
+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}
 
-finale_nolibafs: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser \
-       venus update xstat afsmonitor dauth rxdebug libafsrpc \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin
+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}
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
@@ -522,7 +650,6 @@ clean:
 
 clean2:
        -${COMPILE_PART1} config ${COMPILE_CLEAN}
-       -${COMPILE_PART1} pinstall ${COMPILE_CLEAN}
        -${COMPILE_PART1} procmgmt ${COMPILE_CLEAN}
        -${COMPILE_PART1} util ${COMPILE_CLEAN}
        -${COMPILE_PART1} audit ${COMPILE_CLEAN}
@@ -540,21 +667,23 @@ 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} dauth ${COMPILE_CLEAN}
        -${COMPILE_PART1} libacl ${COMPILE_CLEAN}
        -${COMPILE_PART1} dir ${COMPILE_CLEAN}
        -${COMPILE_PART1} vol ${COMPILE_CLEAN}
        -${COMPILE_PART1} vlserver ${COMPILE_CLEAN}
-       -${COMPILE_PART1} viced ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tvlserver ${COMPILE_CLEAN}
        -${COMPILE_PART1} viced ${COMPILE_CLEAN}
        -${COMPILE_PART1} tviced ${COMPILE_CLEAN}
        -${COMPILE_PART1} volser ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tvolser ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tsalvaged ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus/test ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsd ${COMPILE_CLEAN}
-       -${COMPILE_PART1} null ${COMPILE_CLEAN}
        -${COMPILE_PART1} gtx ${COMPILE_CLEAN}
        -${COMPILE_PART1} fsprobe ${COMPILE_CLEAN}
        -${COMPILE_PART1} scout ${COMPILE_CLEAN}
@@ -564,7 +693,7 @@ clean2:
        -${COMPILE_PART1} sgistuff ${COMPILE_CLEAN}
        -${COMPILE_PART1} tsm41 ${COMPILE_CLEAN}
        -${COMPILE_PART1} sia ${COMPILE_CLEAN}
-       -${COMPILE_PART1} login ${COMPILE_CLEAN}
+       -${COMPILE_PART1} aklog ${COMPILE_CLEAN}
        -${COMPILE_PART1} pam ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsweb ${COMPILE_CLEAN}
        -${COMPILE_PART1} update ${COMPILE_CLEAN}
@@ -576,6 +705,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}
@@ -585,6 +715,8 @@ clean2:
        -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN}
        -${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}
@@ -597,31 +729,25 @@ clean2:
        -${COMPILE_PART1} libadmin/samples ${COMPILE_CLEAN}
        -${COMPILE_PART1} JAVA/libjafs ${COMPILE_CLEAN}
        -${COMPILE_PART1} finale ${COMPILE_CLEAN}
-       -${COMPILE_PART1} mpp ${COMPILE_CLEAN}
-       -${COMPILE_PART1} package ${COMPILE_CLEAN}
-       -${COMPILE_PART1} ntp ${COMPILE_CLEAN}
-       -${COMPILE_PART1} ftpd43+ ${COMPILE_CLEAN}
-       -${COMPILE_PART1} inetd ${COMPILE_CLEAN}
-       -${COMPILE_PART1} rsh ${COMPILE_CLEAN}
-       -${COMPILE_PART1} rlogind ${COMPILE_CLEAN}
-       -${COMPILE_PART1} rcp ${COMPILE_CLEAN}
        -${COMPILE_PART1} libafs ${COMPILE_CLEAN}
        -${COMPILE_PART1} libuafs ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tests ${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}
        -/bin/rm -rf libafs_tree ${SYS_NAME}
 
 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 \
        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 \
@@ -631,6 +757,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 \
@@ -641,21 +768,18 @@ distclean: clean
        src/config/Makefile.version \
        src/config/Makefile.version-NOCML \
        src/config/Makefile.config \
-       src/dauth/Makefile \
        src/des/test/Makefile \
        src/des/Makefile \
-       src/des_stub/Makefile \
        src/dir/test/Makefile \
        src/dir/Makefile \
        src/export/Makefile \
        src/finale/Makefile \
        src/fsint/Makefile \
        src/fsprobe/Makefile \
-       src/ftpd43+/Makefile \
        src/gtx/Makefile \
-       src/inetd/Makefile \
        src/kauth/test/Makefile \
        src/kauth/Makefile \
+       src/kopenafs/Makefile \
        src/libacl/test/Makefile \
        src/libacl/Makefile \
        src/libadmin/adminutil/Makefile \
@@ -673,6 +797,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 \
@@ -680,22 +805,15 @@ distclean: clean
        src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
        src/log/test/Makefile \
        src/log/Makefile \
-       src/login/Makefile \
        src/lwp/test/Makefile \
        src/lwp/Makefile \
-       src/mpp/Makefile \
-       src/ntp/Makefile \
-       src/null/Makefile \
-       src/package/Makefile \
        src/pam/Makefile \
-       src/pinstall/test/Makefile \
-       src/pinstall/Makefile \
+       src/platform/Makefile \
+       src/platform/${MKAFS_OSTYPE}/Makefile \
        src/procmgmt/Makefile \
        src/procmgmt/test/Makefile \
        src/ptserver/Makefile \
-       src/rcp/Makefile \
-       src/rlogind/Makefile \
-       src/rsh/Makefile \
+       src/tptserver/Makefile \
        src/rx/Makefile \
        src/rx/bulk.example/Makefile \
        src/rx/bulktest/Makefile \
@@ -716,10 +834,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 \
@@ -731,91 +851,17 @@ distclean: clean
        src/vfsck/Makefile \
        src/viced/Makefile \
        src/vlserver/Makefile \
+       src/tvlserver/Makefile \
        src/vol/Makefile \
        src/vol/test/Makefile \
        src/volser/Makefile \
-       src/wsadmin.src/Makefile \
-       src/xstat/Makefile 
+       src/xstat/Makefile  \
+       src/helper-splint.sh
+       if test -d doc/man-pages ; then \
+           rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
+       fi
 
 pristine: distclean
        /bin/rm -f src/config/afsconfig.h.in configure configure-libafs aclocal.m4
 
 maintainer-clean: pristine
-
-#
-# Below targets are all deprecated, insecure, or obsolte, 
-# see README.OBSOLETE and README.INSECURE for more info
-#
-
-mpp: project
-       @case ${WITH_OBSOLETE} in \
-       YES)    ${COMPILE_PART1} mpp ${COMPILE_PART2} ;; \
-       *)      echo skipping deprecated target: mpp ;; \
-       esac
-
-package: project mpp
-       @case ${WITH_OBSOLETE} in \
-       YES)    ${COMPILE_PART1} package ${COMPILE_PART2} ;; \
-       *)      echo skipping deprecated target: package ;; \
-       esac
-
-package.files: package
-       @case ${WITH_OBSOLETE} in \
-       YES)    ${DESTDIR}/bin/makepkgfiles afs.dev ;; \
-       *)      echo skipping deprecated target: package.files ;; \
-       esac
-
-ntp: project volser
-       @case ${WITH_OBSOLETE} in \
-       YES)    case ${SYS_NAME} in \
-               sun4x_58 | sunx86_* | *linux* | *fbsd* | ppc_darwin* | *nbsd*) echo skipping ntp for ${SYS_NAME} ;; \
-               * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
-               esac ;; \
-       *)      echo skipping deprecated target: ntp ;; \
-       esac
-
-ftpd43+: project kauth rxkad
-       @case ${WITH_INSECURE} in \
-       YES)    case ${SYS_NAME} in \
-               rs_aix* | sun4x_55 | *linux*) \
-                       ${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \
-               *) echo skip ftpd43+ for ${SYS_NAME} ;; \
-               esac ;; \
-       *)      echo skipping deprecated target: ftpd43+ ;; \
-       esac
-
-inetd: project kauth rxkad
-       @case ${WITH_INSECURE} in \
-       YES)    ${COMPILE_PART1} inetd ${COMPILE_PART2} ;; \
-       *)      echo skipping deprecated target: inetd ;; \
-       esac
-
-rsh: project inetd
-       @case ${WITH_INSECURE} in \
-       YES)    ${COMPILE_PART1} rsh ${COMPILE_PART2} ;; \
-       *)      echo skipping deprecated target: rsh ;; \
-       esac
-
-rlogind: project rsh ftpd43+ login
-       @case ${WITH_INSECURE} in \
-       YES)    case ${SYS_NAME} in \
-               rs_aix*) ${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \
-               *) echo skipping rlogind for ${SYS_NAME} ;; \
-               esac ;; \
-       *)      echo skipping deprecated target: rlogind ;; \
-       esac
-
-rcp: project rsh inetd
-       @case ${WITH_INSECURE} in \
-       YES)    case ${SYS_NAME} in \
-               sgi_* ) echo skip rcp for ${SYS_NAME} ;; \
-               *)      ${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \
-               esac ;; \
-       *)      echo skipping deprecated target: rcp ;; \
-       esac
-
-allrcmds: project rcp rlogind
-
-
-
-