DEVEL15-linux-disable-readahad-20081108
[openafs.git] / Makefile.in
index 62af38e..0bb4c0e 100644 (file)
@@ -15,6 +15,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 WITH_OBSOLETE=@WITH_OBSOLETE@
 
 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
@@ -53,15 +54,19 @@ install_only_libafs: only_libafs install_dirs
 
 dest: all dest_dirs
        $(MAKE) build COMPILE_PART2B=dest
-       -${INSTALL} ${srcdir}/doc/LICENSE ${DEST}/LICENSE
+       -${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
 dest_nolibafs: all_nolibafs dest_dirs
        $(MAKE) build TARGET=finale_nolibafs COMPILE_PART2B=dest
-       -${INSTALL} ${srcdir}/doc/LICENSE ${DEST}/LICENSE
+       -${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
 
 dest_only_libafs: only_libafs dest_dirs
        $(MAKE) build TARGET=libafs COMPILE_PART2B=dest
-       -${INSTALL} ${srcdir}/doc/LICENSE ${DEST}/LICENSE
+       -${INSTALL} ${srcdir}/src/LICENSE ${DEST}/LICENSE
+
+dpkg: dest
+       ln -fs ${srcdir}/src/packaging/Debian debian
+       dpkg-buildpackage -rfakeroot -us -uc
 
 packages: dest
        @case ${SYS_NAME} in \
@@ -73,7 +78,7 @@ packages: dest
                ${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 ) \
+       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} ;; \
@@ -118,7 +123,7 @@ pinstall: config
 procmgmt: pinstall
        ${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: procmgmt
+util: procmgmt des lwp_depinstall
        ${COMPILE_PART1} util ${COMPILE_PART2}
 
 audit: util rx rxkad
@@ -129,7 +134,7 @@ comerr: util
 
 cmd: comerr
        @case ${SYS_NAME} in \
-       sgi_6* | sun*_5[789] | sun*_510 | 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} ;; \
@@ -183,11 +188,35 @@ 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
+       [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT ubik for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tubik  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT ubik for ${SYS_NAME} ;; \
+       esac
+
 ubiktests: ubik
 
 ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall
        ${COMPILE_PART1} ptserver ${COMPILE_PART2}
 
+tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent
+       [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT ptserver for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tptserver  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT ptserver for ${SYS_NAME} ;; \
+       esac
+
 kauth: cmd comerr ubik cmd auth comerr ptserver audit libacl kauth_depinstall
        ${COMPILE_PART1} kauth ${COMPILE_PART2}
 
@@ -213,15 +242,46 @@ 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
+       [ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
+               ${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \
+       *_darwin_[1-6][0-9]) \
+               echo Not building MT tvlserver for ${SYS_NAME} ;; \
+       *_darwin_*) \
+               ${COMPILE_PART1} tvlserver  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT tvlserver for ${SYS_NAME} ;; \
+       esac
+
+
+viced: cmd comerr vlserver 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} ;; \
@@ -234,14 +294,15 @@ 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
-       case ${SYS_NAME} in                                             \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*)   \
-               ${COMPILE_PART1} tvolser  ${COMPILE_PART2} ;;           \
-       *_darwin_[1-6][0-9])                                            \
+tvolser: project tviced usd libafsrpc libafsauthent volser
+       @case ${SYS_NAME} in                                            \
+       *_darwin_[1-6][0-9])                                            \
                echo Not building MT volser for ${SYS_NAME} ;;          \
-       *_darwin_*)                                                     \
-               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
+       *_darwin_*|alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*obsd*)   \
+               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;             \
+               if [ "xyes" = "x$(ENABLE_PTHREADED_UNIK)" ] ; then      \
+                       $(MAKE) $(COMPILE_PART2B)_vos;                                          \
+               fi;;                                                    \
        *)                                                              \
                echo Not building MT volser for ${SYS_NAME} ;;          \
        esac
@@ -277,13 +338,13 @@ scout: cmd comerr gtx fsprobe
 uss: des kauth cmd comerr rx vlserver vol volser
        ${COMPILE_PART1} uss ${COMPILE_PART2}
 
-bozo: cmd comerr 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 | *_darwin* | hp_ux* | 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} ;; \
@@ -324,7 +385,18 @@ sgistuff: cmd comerr kauth rxkad
                echo Skipping sgistuff for ${SYS_NAME} ;; \
        esac
 
-login: cmd comerr kauth rxkad pam sia tsm41 sgistuff
+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}
+
+login: cmd comerr kauth rxkad pam sia tsm41 sgistuff aklog
        set -x; \
        if test "@BUILD_LOGIN@" = "yes"; then \
                ${COMPILE_PART1} login ${COMPILE_PART2} ; \
@@ -332,6 +404,11 @@ login: cmd comerr kauth rxkad pam sia tsm41 sgistuff
                echo Skipping login for ${SYS_NAME} ; \
        fi
 
+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
 #
@@ -352,6 +429,9 @@ ubik_depinstall: pinstall comerr rxgen
 vlserver_depinstall: pinstall rxgen ubik_depinstall auth_depinstall
        ${COMPILE_PART1} vlserver ${COMPILE_DEPINSTALL}
 
+tvlserver_depinstall: pinstall rxgen ubik_depinstall auth_depinstall
+       ${COMPILE_PART1} tvlserver ${COMPILE_DEPINSTALL}
+
 auth_depinstall: pinstall comerr
        ${COMPILE_PART1} auth ${COMPILE_DEPINSTALL}
 
@@ -379,6 +459,9 @@ kauth_depinstall: pinstall rxgen comerr
 ptserver_depinstall: pinstall rxgen comerr
        ${COMPILE_PART1} ptserver ${COMPILE_DEPINSTALL}
 
+${DEST}/bin/dedebug: dedebug
+       ${INSTALL} $? $@
+
 
 #
 # libafs build targets
@@ -386,11 +469,11 @@ 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 \
+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 \
+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) \
@@ -410,13 +493,13 @@ UKERNELDIR= \
 libuafs_setup: config export
        src/config/config src/libuafs/MakefileProto.${MKAFS_OSTYPE} src/libuafs/Makefile ${SYS_NAME}
 
-libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \
+libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fsint_depinstall \
                auth_depinstall dir_depinstall libacl_depinstall rxkad_depinstall \
                ubik_depinstall afs_depinstall kauth_depinstall ptserver_depinstall \
                rxstat_depinstall lwp_depinstall sys_depinstall des
        set -x; \
        case ${SYS_NAME} in \
-       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | ia64_hpux112*) \
+       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \
@@ -446,7 +529,7 @@ 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_aix*|*linux*|hp_ux11*|ia64_hpux*) \
                ${COMPILE_PART1} tbutc ${COMPILE_PART2} ;; \
@@ -457,6 +540,18 @@ tbutc: cmd comerr bubasics butm budb bucoord cmd butc
 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]*) \
+               ${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}
 
@@ -471,7 +566,7 @@ 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} ;; \
@@ -483,7 +578,7 @@ libafsrpc: rx rxkad des
 
 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} ;; \
@@ -496,8 +591,6 @@ libafsauthent: ubik auth kauth libafsrpc
 # 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} ;; \
        *) \
@@ -506,8 +599,6 @@ 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} ;; \
        *) \
@@ -552,16 +643,18 @@ jafs: libjafs
 
 jafsadm: libjafsadm
 
-finale: project cmd comerr afsd butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
+finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo vfsck volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin
+       libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages \
+       platform
        ${COMPILE_PART1} finale ${COMPILE_PART2}
 
-finale_nolibafs: project cmd comerr afsd butc tbutc libuafs audit kauth log package \
-       ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
+finale_nolibafs: project cmd comerr afsd butc tbutc tbudb libuafs audit kauth log package \
+       ptserver tptserver scout bu_utils ubik tubik uss bozo vfsck volser tvolser tsalvaged \
        venus update xstat afsmonitor dauth rxdebug libafsrpc \
-       libafsauthent shlibafsrpc shlibafsauthent libadmin
+       libafsauthent shlibafsrpc shlibafsauthent libadmin login man-pages \
+       platform
        ${COMPILE_PART1} finale ${COMPILE_PART2}
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
@@ -606,17 +699,21 @@ 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} 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}
@@ -630,6 +727,7 @@ clean2:
        -${COMPILE_PART1} sgistuff ${COMPILE_CLEAN}
        -${COMPILE_PART1} tsm41 ${COMPILE_CLEAN}
        -${COMPILE_PART1} sia ${COMPILE_CLEAN}
+       -${COMPILE_PART1} aklog ${COMPILE_CLEAN}
        -${COMPILE_PART1} login ${COMPILE_CLEAN}
        -${COMPILE_PART1} pam ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsweb ${COMPILE_CLEAN}
@@ -642,6 +740,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}
@@ -651,6 +750,7 @@ clean2:
        -${COMPILE_PART1} libafsauthent ${COMPILE_CLEAN}
        -${COMPILE_PART1} shlibafsrpc ${COMPILE_CLEAN}
        -${COMPILE_PART1} shlibafsauthent ${COMPILE_CLEAN}
+       -${COMPILE_PART1} platform ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin/adminutil ${COMPILE_CLEAN}
        -${COMPILE_PART1} libadmin/client ${COMPILE_CLEAN}
@@ -677,13 +777,14 @@ clean2:
 distclean: clean
        /bin/rm -rf lib include
        /bin/rm -f config.log config.cache config.status \
-       src/config/afsconfig.h \
+       src/config/afsconfig.h src/config/stamp-h1 \
        Makefile \
        src/afs/Makefile \
        src/afsd/Makefile \
        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 \
@@ -693,6 +794,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 \
@@ -733,6 +835,7 @@ distclean: clean
        src/libafs/Makefile \
        src/libafs/Makefile.common \
        src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+       src/libafs/afs.${MKAFS_OSTYPE}.plist \
        src/libafsauthent/Makefile \
        src/libafsrpc/Makefile \
        src/libuafs/Makefile \
@@ -749,9 +852,12 @@ distclean: clean
        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/tptserver/Makefile \
        src/rx/Makefile \
        src/rx/bulk.example/Makefile \
        src/rx/bulktest/Makefile \
@@ -772,11 +878,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 \
@@ -788,12 +895,16 @@ 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/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