git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Use rra-c-util m4 from src/external
[openafs.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index b625a46..743612c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,6 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
 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
@@ -146,7 +145,10 @@ config: prelude
 procmgmt: $(DIR_roken) config
        +${COMPILE_PART1} procmgmt ${COMPILE_PART2}
 
-util: $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
+opr: config $(DIR_roken)
+       +${COMPILE_PART1} opr ${COMPILE_PART2}
+
+util: opr $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
        +${COMPILE_PART1} util ${COMPILE_PART2}
 
 libafscp: util afs volser vlserver rx auth fsint
@@ -221,13 +223,9 @@ ubik: cmd comerr auth ubik_depinstall sys
        +${COMPILE_PART1} ubik ${COMPILE_PART2}
 
 tubik: ubik libafsrpc libafsauthent
-       +[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
-       alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
+       +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
@@ -238,13 +236,9 @@ 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*|*[nof]bsd*) \
+       +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
@@ -286,13 +280,9 @@ 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*|*[nof]bsd*) \
+       +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
@@ -317,16 +307,13 @@ dviced: cmd comerr viced vlserver tvlserver libafsrpc libafsauthent
                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
        +@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;;                                                    \
+               ${COMPILE_PART1} tvolser ${COMPILE_PART2} ;;            \
        *)                                                              \
                echo Not building MT volser for ${SYS_NAME} ;;          \
        esac
@@ -342,7 +329,7 @@ dvolser: project tviced usd libafsrpc libafsauthent volser
 rxosdsrc: rxgen
        +${COMPILE_PART1} rxosd ${COMPILE_PART2A} source
 
-venus: cmd comerr volser ptserver libafscp
+venus: cmd comerr volser ptserver libafscp libafsauthent
        +${COMPILE_PART1} venus ${COMPILE_PART2}
        +${COMPILE_PART1} venus/test ${COMPILE_PART2}
 
@@ -546,7 +533,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} ;; \
@@ -555,14 +542,10 @@ 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*|*[nof]bsd*) \
+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
@@ -596,7 +579,7 @@ libafsrpc: rx rxkad rxstat fsint hcrypto
                echo Not building MT libafsrpc for ${SYS_NAME} ;; \
        esac
 
-libafsauthent: ubik auth kauth libafsrpc
+libafsauthent: ubik auth kauth libafsrpc volser vlserver
        +case ${SYS_NAME} in \
        alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[nof]bsd*) \
        ${COMPILE_PART1} libafsauthent ${COMPILE_PART2} ;; \
@@ -714,6 +697,7 @@ 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}
@@ -805,8 +789,15 @@ clean2:
        -/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)
+
 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 \
@@ -882,6 +873,7 @@ distclean: clean
        src/log/test/Makefile \
        src/lwp/Makefile \
        src/lwp/test/Makefile \
+       src/opr/Makefile \
        src/packaging/Debian/changelog \
        src/packaging/MacOS/OpenAFS-debug.Description.plist \
        src/packaging/MacOS/OpenAFS-debug.Info.plist \
@@ -950,6 +942,7 @@ distclean: clean
        tests/cmd/Makefile \
        tests/common/Makefile \
        tests/util/Makefile \
+       tests/volser/Makefile \
        src/helper-splint.sh
        if test -d doc/man-pages ; then \
            rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
OpenAFS Master Repository