generated: take into account the things needed in master

[openafs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2fa9b20..b625a46 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,10 +9,6 @@
 
 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@
@@ -55,7 +51,6 @@ 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}
@@ -68,6 +63,8 @@ generated: force buildtools
        +${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
 
 install: all install_dirs
        $(MAKE) build COMPILE_PART2B=install
@@ -153,11 +150,7 @@ 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
+       +${COMPILE_PART1} libafscp ${COMPILE_PART2}
 
 audit: util rx rxkad fsint
        +${COMPILE_PART1} audit ${COMPILE_PART2} #TODO
@@ -673,7 +666,7 @@ 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 \
@@ -953,6 +946,10 @@ distclean: clean
        tests/Makefile \
        tests/rpctestlib/Makefile \
        tests/tap/Makefile \
+       tests/auth/Makefile \
+       tests/cmd/Makefile \
+       tests/common/Makefile \
+       tests/util/Makefile \
        src/helper-splint.sh
        if test -d doc/man-pages ; then \
            rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \