demand attach build always

[openafs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ebcc80e..06e729f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -265,21 +265,14 @@ 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*) \
+       +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
@@ -303,23 +296,25 @@ viced: cmd comerr vlserver tvlserver audit
 
 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]*) \
+       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}
 
 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_*|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      \
@@ -329,6 +324,14 @@ tvolser: project tviced usd libafsrpc libafsauthent volser
                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}
@@ -644,6 +647,7 @@ build_tools: config des comerr rxgen
 
 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 \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
        platform kopenafs authtools
@@ -651,6 +655,7 @@ finale: project cmd comerr afsd butc tbutc tbudb @ENABLE_KERNEL_MODULE@ libuafs
 
 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 \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
        platform kopenafs authtools
@@ -711,8 +716,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}
@@ -809,6 +816,8 @@ distclean: clean
        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 \