lwp: fix bug in rw with assigning reader id
[openafs.git] / Makefile.in
index ae16118..4298775 100644 (file)
@@ -9,18 +9,14 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-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@
+DOXYGEN=@DOXYGEN@
 
 # To compile AFS from scratch in the src tree run "make".
 #   This recursively calls "make install ..." and does not depend on the
 #   existence of any non-standard programs.
-# To compile for the kernel type "make blibafs".  This assumes install, 
+# To compile for the kernel type "make blibafs".  This assumes install,
 #   rxgen, compile_et and others already exist and runs it with
 #   "-argument kinstall".
 
@@ -47,6 +43,9 @@ only_libafs_tree: force
 buildtools: force
        $(MAKE) build TARGET=build_tools COMPILE_PART2B=buildtools
 
+cscope:
+       ( cd src ; cscope -b -R )
+
 generated: force buildtools
        +${COMPILE_PART1} afs ${COMPILE_GENERATED}
        +${COMPILE_PART1} auth ${COMPILE_GENERATED}
@@ -55,18 +54,21 @@ generated: force buildtools
        +${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} rxgk ${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}
+       +${COMPILE_PART1} config ${COMPILE_PART2A} generated_clean
+       +${COMPILE_PART1} roken ${COMPILE_PART2A} clean
+       +${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2A} clean
+       +${COMPILE_PART1} opr ${COMPILE_PART2A} clean
 
 install: all install_dirs
        $(MAKE) build COMPILE_PART2B=install
@@ -79,24 +81,20 @@ install_only_libafs: only_libafs install_dirs
 
 dest: all dest_dirs
        $(MAKE) build COMPILE_PART2B=dest
-       -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+       -${INSTALL_DATA} ${srcdir}/LICENSE ${DEST}/LICENSE
 
 dest_nolibafs: all_nolibafs dest_dirs
        $(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=dest
-       -${INSTALL_DATA} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+       -${INSTALL_DATA} ${srcdir}/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:
-       ln -fs ${srcdir}/src/packaging/Debian debian
-       dpkg-buildpackage -rfakeroot -b -us -uc
+       -${INSTALL_DATA} ${srcdir}/LICENSE ${DEST}/LICENSE
 
 packages: dest
        @case ${SYS_NAME} in \
        *_darwin_* ) \
-               ${COMPILE_PART1} packaging/MacOS && sh ./buildpkg.sh ${DEST} ;; \
+               ${COMPILE_PART1} packaging/MacOS && bash ./buildpkg.sh ${DEST} ;; \
        hp_ux110 ) \
                ${COMPILE_PART1} packaging/HP-UX && swpackage -s  psf-1.2.10-transarc-paths-11.00 ;; \
        hp_ux11i ) \
@@ -109,7 +107,7 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/opr ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -135,26 +133,33 @@ 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_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR}
+prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto \
+       ${TOP_INCDIR}/opr ${TOP_LIBDIR}
 
-project: cmd comerr 
+project: cmd comerr
 
-tests: all 
+tests: all
        +${COMPILE_PART1} tests ${COMPILE_PART2}
 
 config: prelude
        +${COMPILE_PART1} config ${COMPILE_PART2}
 
-procmgmt: config
+procmgmt: $(DIR_roken) config
        +${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt des lwp_depinstall rx_depinstall
+opr: config hcrypto $(DIR_roken)
+       +${COMPILE_PART1} opr ${COMPILE_PART2}
+
+util: opr $(DIR_roken) procmgmt hcrypto lwp
        +${COMPILE_PART1} util ${COMPILE_PART2}
 
+libafscp: util afs volser vlserver rx auth fsint
+       +${COMPILE_PART1} libafscp ${COMPILE_PART2}
+
 audit: util rx rxkad fsint
        +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
 
-comerr: util
+comerr: util $(DIR_roken)
        +${COMPILE_PART1} comerr ${COMPILE_PART2}
 
 cmd: comerr
@@ -165,16 +170,22 @@ cmd: comerr
                ${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \
        esac
 
-hcrypto: config
+hcrypto: config $(DIR_roken)
        +${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2}
 
-lwp: util lwp_depinstall
+rfc3961: config hcrypto
+       +${COMPILE_PART1} crypto/rfc3961 ${COMPILE_PART2}
+
+lwp: opr $(DIR_roken) lwp_depinstall
        +${COMPILE_PART1} lwp ${COMPILE_PART2}
 
-rxgen: config
+roken: config
+       +${COMPILE_PART1} roken ${COMPILE_PART2}
+
+rxgen: $(DIR_roken) config
        +${COMPILE_PART1} rxgen ${COMPILE_PART2}
 
-rx: config lwp rxgen rx_depinstall
+rx: config lwp rxgen rx_depinstall util
        +${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxstat: rx rxstat_depinstall
@@ -187,9 +198,9 @@ rxdebug: rx sys
 fsint: cmd comerr rxgen rx lwp fsint_depinstall
        +${COMPILE_PART1} fsint ${COMPILE_PART2}
 
-export2: project 
+export2: project
 
-export: 
+export:
        @case ${SYS_NAME} in \
        rs_aix*) \
                ${MAKE} export_build ; \
@@ -201,29 +212,25 @@ export_build: fsint
 afs: config export comerr afs_depinstall
        +${COMPILE_PART1} afs ${COMPILE_PART2}
 
-des: config
-       +${COMPILE_PART1} des ${COMPILE_PART2}
-
-sys: cmd comerr afs des rx rxstat fsint auth sys_depinstall
+sys: cmd comerr afs hcrypto rx rxstat fsint sys_depinstall
        +${COMPILE_PART1} sys ${COMPILE_PART2}
 
-rxkad: cmd comerr des rx rxkad_depinstall
+rxgk: cmd comerr hcrypto rx rxgk_depinstall
+       +${COMPILE_PART1} rxgk ${COMPILE_PART2}
+
+rxkad: cmd comerr hcrypto rfc3961 rx rxkad_depinstall
        +${COMPILE_PART1} rxkad ${COMPILE_PART2}
 
-auth: cmd comerr comerr des lwp rx rxkad audit sys_depinstall auth_depinstall
+auth: cmd comerr hcrypto lwp rx rxkad audit sys auth_depinstall
        +${COMPILE_PART1} auth ${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 \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+tubik: ubik libafsrpc libafsauthent
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \
                ${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
@@ -234,18 +241,15 @@ ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall
        +${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]*) \
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \
                ${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 sys_depinstall
+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
@@ -254,22 +258,12 @@ libacl: cmd comerr ptserver libacl_depinstall
 dir: cmd comerr libacl dir_depinstall
        +${COMPILE_PART1} dir ${COMPILE_PART2}
 
-# Removed from sgi_* case below:
-# ${COMPILE_PART1} sgiefs ${COMPILE_PART2};;
-sgiefs:
-       +case ${SYS_NAME} in \
-       sgi_*) \
-                echo "SGI efs not supported" ;; \
-       *) \
-               echo No efs stuff for ${SYS_NAME};; \
-       esac
-
-vol: cmd comerr dir afs sgiefs
+vol: cmd comerr dir afs $(DIR_roken)
        +${COMPILE_PART1} vol ${COMPILE_PART2}
 
 tsalvaged: vol libafsrpc libafsauthent cmd util
        +case ${SYS_NAME} in \
-               alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*|*_darwin_*) \
+               alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[fn]bsd*|*_darwin_*) \
                        ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \
                *_darwin_*) \
                        ${COMPILE_PART1} tsalvaged  ${COMPILE_PART2} ;; \
@@ -281,77 +275,76 @@ tsalvaged: vol libafsrpc libafsauthent cmd util
 vlserver: cmd comerr vol audit vlserver_depinstall
        +${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]*) \
+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*|*[nof]bsd*|*_darwin_*) \
                ${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
+viced: cmd comerr vlserver tvlserver libafsrpc libafsauthent 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]*|*_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_*) \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \
                ${COMPILE_PART1} dviced ${COMPILE_PART2} ;; \
        *) \
                echo Not building DAFS viced for ${SYS_NAME} ;; \
        esac
 
-volser: cmd comerr tviced usd kauth audit
+volser: cmd comerr usd kauth vlserver audit
        +${COMPILE_PART1} volser ${COMPILE_PART2}
 
-tvolser: project tviced usd libafsrpc libafsauthent volser
+tvolser: project viced usd libafsrpc libafsauthent volser
        +@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;;                                                    \
+       *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*)   \
+               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
        *)                                                              \
                echo Not building MT volser for ${SYS_NAME} ;;          \
        esac
 
-dvolser: project tviced usd libafsrpc libafsauthent volser
+dvolser: project viced usd libafsrpc libafsauthent volser
        +@case ${SYS_NAME} in                                           \
-       *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
+       *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*)   \
                ${COMPILE_PART1} dvolser ${COMPILE_PART2} ;;            \
        *)                                                              \
                echo Not building DAFS volser for ${SYS_NAME} ;;          \
        esac
 
-venus: cmd comerr volser ptserver
+rxosdsrc: rxgen
+       +${COMPILE_PART1} rxosd ${COMPILE_PART2A} source
+
+venus: cmd comerr volser ptserver libafscp libafsauthent
        +${COMPILE_PART1} venus ${COMPILE_PART2}
+venustests: venus
        +${COMPILE_PART1} venus/test ${COMPILE_PART2}
 
-afsd: cmd comerr sys kauth @CLIENT_UAFS_DEP@
+afsd: cmd comerr sys kauth libafsauthent @CLIENT_UAFS_DEP@
        +${COMPILE_PART1} afsd ${COMPILE_PART2}
 
 gtx: cmd comerr auth kauth
-       +${COMPILE_PART1} gtx ${COMPILE_PART2}
+       +set -x; \
+       if test "@LIB_curses@"; then \
+               ${COMPILE_PART1} gtx ${COMPILE_PART2} ; \
+       else \
+               echo Not building gtx, because no curses-headers found. ; \
+       fi
 
 fsprobe: cmd comerr util fsint volser
        +${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
 scout: cmd comerr gtx fsprobe
-       +${COMPILE_PART1} scout ${COMPILE_PART2}
+       +if test "@LIB_curses@"; then \
+               ${COMPILE_PART1} scout ${COMPILE_PART2} ; \
+       else \
+               echo Not building scout, because no curses-headers found. ; \
+       fi
 
-uss: des kauth cmd comerr rx vlserver vol volser
+uss: hcrypto kauth cmd comerr rx vlserver vol volser
        +${COMPILE_PART1} uss ${COMPILE_PART2}
 
 bozo: cmd comerr audit auth kauth volser
@@ -360,13 +353,13 @@ bozo: cmd comerr audit auth kauth volser
 vfsck: vol
        +set -x; \
        case ${SYS_NAME} in \
-       sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* ) \
+       sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* ) \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac
 
-pam: auth shlibafsauthent shlibafsrpc
+pam: auth libafsauthent
        +set -x; \
        if test "@HAVE_PAM@" = "yes"; then \
                ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
@@ -383,16 +376,7 @@ tsm41: cmd comerr kauth rxkad
                echo Skipping tsm41 for ${SYS_NAME} ;; \
        esac
 
-sgistuff: cmd comerr kauth rxkad
-       +set -x; \
-       case ${SYS_NAME} in \
-       sgi_* ) \
-               ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
-       * ) \
-               echo Skipping sgistuff for ${SYS_NAME} ;; \
-       esac
-
-aklog: comerr ptserver
+aklog: auth comerr ptserver libafsauthent
        +set -x; \
        if test "@BUILD_KRB5@" = "yes"; then \
                ${COMPILE_PART1} aklog ${COMPILE_PART2} ; \
@@ -400,18 +384,22 @@ aklog: comerr ptserver
                echo Skipping aklog for ${SYS_NAME} ; \
        fi
 
-authtools: pam tsm41 sgistuff aklog
+authtools: pam tsm41 platform aklog
 
 platform: config cmd vol
        +${COMPILE_PART1} platform ${COMPILE_PART2}
 
+tools: config audit volser vlserver
+       +${COMPILE_PART1} tools ${COMPILE_PART2}
+
 man-pages: config
        +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
+# _depinstall targets - only build and install headers/sources that are
+#                      needed by libafs/libuafs
 #
 # encode dependencies within the _depinstall targets as required
 #
@@ -421,6 +409,9 @@ lwp_depinstall: config
 rx_depinstall: config
        +${COMPILE_PART1} rx ${COMPILE_DEPINSTALL}
 
+rxgk_depinstall: config comerr
+       +${COMPILE_PART1} rxgk ${COMPILE_DEPINSTALL}
+
 rxkad_depinstall: config comerr
        +${COMPILE_PART1} rxkad ${COMPILE_DEPINSTALL}
 
@@ -467,13 +458,19 @@ ${DEST}/bin/dedebug: dedebug
 #
 # libafs build targets
 #
-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}
+libafs: config export rfc3961 hcrypto lwp_depinstall \
+       rx_depinstall vlserver_depinstall tvlserver_depinstall \
+       rxkad_depinstall fsint_depinstall \
+       libacl_depinstall afs_depinstall dir_depinstall \
+       rxstat_depinstall sys_depinstall auth_depinstall \
+       rxosdsrc
+       ${CONFIGTOOL} src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
        +${COMPILE_PART1} libafs ${COMPILE_PART2}
 
-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
+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) \
@@ -485,20 +482,17 @@ libafs_tree: export lwp_depinstall rx_depinstall vlserver_depinstall tvlserver_d
 # libuafs build targets
 #
 
-UKERNELDIR= \
-  des \
-  afsweb 
-
 libuafs_setup: config export
-       src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
+       ${CONFIGTOOL} src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
 
-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 cmd
+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 cmd hcrypto
        +set -x; \
        case ${SYS_NAME} in \
-       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
+       hp_ux102* | *_obsd* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \
@@ -530,7 +524,7 @@ butc: cmd comerr bubasics butm budb bucoord cmd rxgen rx
 
 tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
        +case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*_darwin_*) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
        *) \
                echo Not building MT butc for ${SYS_NAME} ;; \
@@ -539,33 +533,34 @@ tbutc: cmd comerr bubasics butm budb bucoord cmd butc libadmin
 budb: cmd comerr bubasics uss
        +${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]*) \
+tbudb: budb tubik
+       +case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*|*_darwin_*) \
                ${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
+bucoord: cmd comerr bubasics budb volser butm
        +${COMPILE_PART1} bucoord ${COMPILE_PART2}
 
 xstat: cmd comerr fsint viced
        +${COMPILE_PART1} xstat ${COMPILE_PART2}
 
 afsmonitor: cmd comerr gtx xstat
-       +${COMPILE_PART1} afsmonitor ${COMPILE_PART2}
+       +set -x; \
+       if test "@LIB_curses@"; then \
+               ${COMPILE_PART1} afsmonitor ${COMPILE_PART2} ; \
+       else \
+               echo Not building afsmonitor, because no curses-headers found. ; \
+       fi
 
-tests: rxtests ubiktests rpctestlib
+tests: rxtests ubiktests rpctestlib viced
 
 # pthread based user space RX library
-libafsrpc: rx rxkad des
+libafsrpc: comerr fsint hcrypto lwp rx rxkad rxstat sys util
        +case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
        ${COMPILE_PART1} libafsrpc ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
@@ -575,9 +570,9 @@ libafsrpc: rx rxkad des
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
        esac
 
-libafsauthent: ubik auth kauth libafsrpc
+libafsauthent: audit auth kauth ubik util sys ptserver volser vlserver libafsrpc
        +case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+       alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
        ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
        *_darwin_[1-6][0-9]) \
                echo Not building MT libafsauthent for ${SYS_NAME} ;; \
@@ -587,27 +582,10 @@ libafsauthent: ubik auth kauth libafsrpc
                echo Not building MT libafsauthent for ${SYS_NAME} ;; \
        esac
 
-# 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*|*_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*|*_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}
 
-libadmin_real: 
+libadmin_real:
        +${COMPILE_PART1} libadmin ${COMPILE_PART2}
        +${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2}
        +${COMPILE_PART1} libadmin/vos ${COMPILE_PART2}
@@ -619,7 +597,7 @@ libadmin_real:
        +${COMPILE_PART1} libadmin/test ${COMPILE_PART2}
        +${COMPILE_PART1} libadmin/samples ${COMPILE_PART2}
 
-libadmin: libafsauthent bozo
+libadmin: libafsauthent bozo bubasics
        +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                        $(MAKE) libadmin_real ;; \
@@ -645,30 +623,31 @@ jafs: libjafs
 
 jafsadm: libjafsadm
 
-build_tools: config des comerr rxgen
+build_tools: config 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 \
-       dviced dvolser \
-       venus update xstat afsmonitor rxdebug libafsrpc hcrypto \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
-       platform kopenafs authtools
+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 dviced dvolser libafscp \
+       venus venustests update xstat afsmonitor rxdebug libafsrpc rfc3961 \
+       hcrypto libafsauthent libadmin man-pages tools platform kopenafs \
+       authtools $(DIR_roken)
        +${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 \
-       dviced dvolser \
-       venus update xstat afsmonitor rxdebug libafsrpc hcrypto \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
-       platform kopenafs authtools
+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 dviced dvolser libafscp venus venustests \
+       update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \
+       libafsauthent libadmin man-pages tools platform kopenafs \
+       authtools $(DIR_roken)
        +${COMPILE_PART1} finale ${COMPILE_PART2}
 
+rpctestlib: util fsint rx opr libafsrpc libafsauthent
+       +${TEST_PART1} rpctestlib  ${COMPILE_PART2}
+
 check test: finale
        cd tests && $(MAKE) check
 
-# Use washtool to ensure MakefileProto is current and obj/libafs exists.
-
 force:
 
 TARGET=finale
@@ -693,6 +672,8 @@ clean2:
        -${COMPILE_PART1} config ${COMPILE_CLEAN}
        -${COMPILE_PART1} procmgmt ${COMPILE_CLEAN}
        -${COMPILE_PART1} util ${COMPILE_CLEAN}
+       -${COMPILE_PART1} opr ${COMPILE_CLEAN}
+       -${COMPILE_PART1} libafscp ${COMPILE_CLEAN}
        -${COMPILE_PART1} audit ${COMPILE_CLEAN}
        -${COMPILE_PART1} comerr ${COMPILE_CLEAN}
        -${COMPILE_PART1} cmd ${COMPILE_CLEAN}
@@ -703,8 +684,8 @@ clean2:
        -${COMPILE_PART1} fsint ${COMPILE_CLEAN}
        -${COMPILE_PART1} export ${COMPILE_CLEAN}
        -${COMPILE_PART1} afs ${COMPILE_CLEAN}
-       -${COMPILE_PART1} des ${COMPILE_CLEAN}
        -${COMPILE_PART1} sys ${COMPILE_CLEAN}
+       -${COMPILE_PART1} rxgk ${COMPILE_CLEAN}
        -${COMPILE_PART1} rxkad ${COMPILE_CLEAN}
        -${COMPILE_PART1} auth ${COMPILE_CLEAN}
        -${COMPILE_PART1} ubik ${COMPILE_CLEAN}
@@ -718,7 +699,6 @@ clean2:
        -${COMPILE_PART1} vlserver ${COMPILE_CLEAN}
        -${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}
@@ -733,7 +713,6 @@ clean2:
        -${COMPILE_PART1} uss ${COMPILE_CLEAN}
        -${COMPILE_PART1} bozo ${COMPILE_CLEAN}
        -${COMPILE_PART1} vfsck ${COMPILE_CLEAN}
-       -${COMPILE_PART1} sgistuff ${COMPILE_CLEAN}
        -${COMPILE_PART1} tsm41 ${COMPILE_CLEAN}
        -${COMPILE_PART1} sia ${COMPILE_CLEAN}
        -${COMPILE_PART1} aklog ${COMPILE_CLEAN}
@@ -752,13 +731,11 @@ clean2:
        -${COMPILE_PART1} bucoord ${COMPILE_CLEAN}
        -${COMPILE_PART1} xstat ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsmonitor ${COMPILE_CLEAN}
-       -${COMPILE_PART1} tests ${COMPILE_CLEAN}
        -${COMPILE_PART1} rxdebug ${COMPILE_CLEAN}
        -${COMPILE_PART1} libafsrpc ${COMPILE_CLEAN}
        -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN}
-       -${COMPILE_PART1} shlibafsrpc ${COMPILE_CLEAN}
-       -${COMPILE_PART1} shlibafsauthent ${COMPILE_CLEAN}
        -${COMPILE_PART1} kopenafs ${COMPILE_CLEAN}
+       -${COMPILE_PART1} tools ${COMPILE_CLEAN}
        -${COMPILE_PART1} platform ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin/adminutil ${COMPILE_CLEAN}
@@ -774,15 +751,32 @@ clean2:
        -${COMPILE_PART1} finale ${COMPILE_CLEAN}
        -${COMPILE_PART1} libafs ${COMPILE_CLEAN}
        -${COMPILE_PART1} libuafs ${COMPILE_CLEAN}
+       -${COMPILE_PART1} rxosd ${COMPILE_CLEAN}
        -${COMPILE_PART1} tests ${COMPILE_CLEAN}
        -${COMPILE_PART1} crypto/hcrypto ${COMPILE_CLEAN}
+       -${COMPILE_PART1} roken ${COMPILE_CLEAN}
+       -${COMPILE_PART1} crypto/rfc3961 ${COMPILE_CLEAN}
+       -(cd src; /bin/rm cscope.out)
        -(cd src/libafs; /bin/rm -rf afs afsint config rx)
-       -(cd src/libuafs; /bin/rm -rf afs afsint config rx des)
+       -(cd src/libuafs; /bin/rm -rf afs afsint config rx)
+       -(cd tests ${COMPILE_CLEAN})
        -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} ${TOP_JLIBDIR}
        -/bin/rm -rf libafs_tree ${SYS_NAME}
 
+dist:
+       mkdir -p packages
+       ./build-tools/make-release --dir=packages HEAD
+
+srpm:
+       (cd packages && ../src/packaging/RedHat/makesrpm.pl *-src.tar.bz2 *-doc.tar.bz2)
+
+dox:
+       if test "x$(DOXYGEN)" != "x"; then \
+           mkdir -p doc/doxygen/output && $(DOXYGEN) doc/doxygen/Doxyfile; \
+       fi
+
 distclean: clean
-       /bin/rm -rf lib include
+       /bin/rm -rf lib include packages
        /bin/rm -f config.log config.cache config.status \
        src/config/afsconfig.h src/config/stamp-h1 \
        src/libafs/Makefile \
@@ -811,14 +805,17 @@ distclean: clean
        src/comerr/test/Makefile \
        src/config/Makefile \
        src/config/Makefile.config \
+       src/config/Makefile.libtool \
+       src/config/Makefile.lwp \
+       src/config/Makefile.lwptool \
+       src/config/Makefile.pthread \
        src/config/Makefile.version \
        src/config/Makefile.version-CML \
        src/config/Makefile.version-NOCML \
        src/config/shlib-build \
        src/config/shlib-install \
        src/crypto/hcrypto/Makefile \
-       src/des/Makefile \
-       src/des/test/Makefile \
+       src/crypto/rfc3961/Makefile \
        src/dir/Makefile \
        src/dir/test/Makefile \
        src/dviced/Makefile \
@@ -856,7 +853,7 @@ distclean: clean
        src/log/test/Makefile \
        src/lwp/Makefile \
        src/lwp/test/Makefile \
-       src/packaging/Debian/changelog \
+       src/opr/Makefile \
        src/packaging/MacOS/OpenAFS-debug.Description.plist \
        src/packaging/MacOS/OpenAFS-debug.Info.plist \
        src/packaging/MacOS/OpenAFS.Description.plist \
@@ -872,6 +869,7 @@ distclean: clean
        src/procmgmt/test/Makefile \
        src/ptserver/Makefile \
        src/tptserver/Makefile \
+       src/roken/Makefile \
        src/rx/Makefile \
        src/rx/bulk.example/Makefile \
        src/rx/bulktest/Makefile \
@@ -880,20 +878,22 @@ distclean: clean
        src/rx/test/Makefile \
        src/rxdebug/Makefile \
        src/rxgen/Makefile \
+       src/rxgk/Makefile \
        src/rxkad/Makefile \
        src/rxkad/test/Makefile \
+       src/rxosd/Makefile \
        src/rxstat/Makefile \
        src/scout/Makefile \
-       src/sgistuff/Makefile \
-       src/shlibafsauthent/Makefile \
-       src/shlibafsrpc/Makefile \
        src/sys/Makefile \
        src/tbutc/Makefile \
        src/tests/Makefile \
        src/tests/run-tests \
+       src/tests/auth/Makefile \
+       src/tools/Makefile \
+       src/tools/dumpscan/Makefile \
+       src/tools/rxperf/Makefile \
        src/tsalvaged/Makefile \
        src/tsm41/Makefile \
-       src/tviced/Makefile \
        src/tvolser/Makefile \
        src/ubik/Makefile \
        src/tubik/Makefile \
@@ -903,6 +903,7 @@ distclean: clean
        src/uss/Makefile \
        src/util/Makefile \
        src/util/test/Makefile \
+       src/libafscp/Makefile \
        src/venus/Makefile \
        src/venus/test/Makefile \
        src/vfsck/Makefile \
@@ -916,12 +917,46 @@ distclean: clean
        tests/Makefile \
        tests/rpctestlib/Makefile \
        tests/tap/Makefile \
-       src/helper-splint.sh
+       tests/auth/Makefile \
+       tests/cmd/Makefile \
+       tests/common/Makefile \
+       tests/rx/Makefile \
+       tests/opr/Makefile \
+       tests/util/Makefile \
+       tests/volser/Makefile \
+       src/helper-splint.sh \
+       doc/xml/AdminGuide/Makefile \
+       doc/xml/QuickStartUnix/Makefile \
+       doc/xml/UserGuide/Makefile \
+       doc/xml/AdminRef/Makefile
        if test -d doc/man-pages ; then \
-           rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
+           /bin/rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
+       fi
+       if test -d doc/doxygen ; then \
+           /bin/rm -f doc/doxygen/Doxyfile ; \
        fi
 
 pristine: distclean
-       /bin/rm -f src/config/afsconfig.h.in configure configure-libafs aclocal.m4
+       /bin/rm -f src/config/afsconfig.h.in configure configure-libafs \
+       aclocal.m4 \
+       libtool \
+       build-tools/ltmain.sh \
+       src/cf/libtool.m4 \
+       src/cf/ltoptions.m4 \
+       src/cf/ltsugar.m4 \
+       src/cf/ltversion.m4 \
+       src/cf/lt~obsolete.m4
+       if test -d doc/xml ; then \
+           /bin/rm -f doc/xml/mobi-fixup.xsl ; \
+       fi
+       if test -d doc/man-pages ; then \
+           /bin/rm -rf doc/man-pages/man1 \
+               doc/man-pages/man3 \
+               doc/man-pages/man5 \
+               doc/man-pages/man8 ; \
+       fi
+       for i in doc/man-pages/pod*/*.pod.in; do \
+           /bin/rm -f $${i%.in}; \
+       done
 
 maintainer-clean: pristine