ubik: Introduce version lock

[openafs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9ef9f80..b40d9f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,6 +67,7 @@ generated: force buildtools
        +${COMPILE_PART1} update ${COMPILE_GENERATED}
        +${COMPILE_PART1} vlserver ${COMPILE_GENERATED}
        +${COMPILE_PART1} volser ${COMPILE_GENERATED}
+       +${COMPILE_PART1} config ${COMPILE_PART2A} generated_clean
 
 install: all install_dirs
        $(MAKE) build COMPILE_PART2B=install
@@ -109,7 +110,7 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${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,7 +136,7 @@ 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}/hcrypto ${TOP_LIBDIR}
+prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/opr ${TOP_LIBDIR}
 
 project: cmd comerr 
 
@@ -151,6 +152,13 @@ procmgmt: config
 util: $(DIR_roken) procmgmt hcrypto lwp_depinstall rx_depinstall
        +${COMPILE_PART1} util ${COMPILE_PART2}
 
+libafscp: util afs volser vlserver rx auth fsint
+       +if test "@BUILD_KRB5@" = "yes"; then \
+               ${COMPILE_PART1} libafscp ${COMPILE_PART2} ; \
+       else \
+               echo Skipping libafscp for ${SYS_NAME} ; \
+       fi
+
 audit: util rx rxkad fsint
        +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
 
@@ -168,6 +176,9 @@ cmd: comerr
 hcrypto: config $(DIR_roken)
        +${COMPILE_PART1} crypto/hcrypto ${COMPILE_PART2}
 
+rfc3961: config hcrypto
+       +${COMPILE_PART1} crypto/rfc3961 ${COMPILE_PART2}
+
 lwp: util lwp_depinstall
        +${COMPILE_PART1} lwp ${COMPILE_PART2}
 
@@ -357,7 +368,7 @@ fsprobe: cmd comerr util fsint volser
        +${COMPILE_PART1} fsprobe ${COMPILE_PART2}
 
 scout: cmd comerr gtx fsprobe
-       if test "@LIB_curses@"; then \
+       +if test "@LIB_curses@"; then \
                ${COMPILE_PART1} scout ${COMPILE_PART2} ; \
        else \
                echo Not building scout, because no curses-headers found. ; \
@@ -479,8 +490,12 @@ ${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 rxosdsrc
+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
        src/config/config src/libafs/MakefileProto.${MKAFS_OSTYPE} src/libafs/Makefile ${SYS_NAME}
        +${COMPILE_PART1} libafs ${COMPILE_PART2}
 
@@ -663,16 +678,16 @@ 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 hcrypto \
+       dviced dvolser libafscp\
+       venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
        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 \
+       dviced dvolser libafscp\
+       venus update xstat afsmonitor rxdebug libafsrpc rfc3961 hcrypto \
        libafsauthent shlibafsrpc shlibafsauthent libadmin man-pages \
        platform kopenafs authtools $(DIR_roken)
        +${COMPILE_PART1} finale ${COMPILE_PART2}
@@ -706,6 +721,7 @@ clean2:
        -${COMPILE_PART1} config ${COMPILE_CLEAN}
        -${COMPILE_PART1} procmgmt ${COMPILE_CLEAN}
        -${COMPILE_PART1} util ${COMPILE_CLEAN}
+       -${COMPILE_PART1} libafscp ${COMPILE_CLEAN}
        -${COMPILE_PART1} audit ${COMPILE_CLEAN}
        -${COMPILE_PART1} comerr ${COMPILE_CLEAN}
        -${COMPILE_PART1} cmd ${COMPILE_CLEAN}
@@ -786,9 +802,11 @@ 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/libafs; /bin/rm -rf afs afsint config rx)
        -(cd src/libuafs; /bin/rm -rf afs afsint config rx)
        -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} ${TOP_JLIBDIR}
@@ -833,6 +851,7 @@ distclean: clean
        src/config/shlib-build \
        src/config/shlib-install \
        src/crypto/hcrypto/Makefile \
+       src/crypto/rfc3961/Makefile \
        src/dir/Makefile \
        src/dir/test/Makefile \
        src/dviced/Makefile \
@@ -920,6 +939,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 \