Remove all makefiles in make distclean

Change the build system to descend into every directory where we
create a Makefile, but not to build or run anything during "make all"
and "make check" in directories we previously didn't visit.  Document
specific build targets that can be used in those directories.

Do not generate a Makefile for the securid_sam2 module unless we are
building it, for consistency with other conditionally built
directories.

diff --git a/src/Makefile.in b/src/Makefile.in
index 15b9cbbdc31f0fc37f32ea300cd37a3d6744e011..814e5af0355c1972735c93ba9cdefd41ff381917 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -20,9 +20,12 @@ SUBDIRS=util include lib \
        plugins/kdb/db2 \
        @ldap_plugin_dir@ \
        plugins/kdb/test \
+       plugins/locate/python \
+       plugins/preauth/cksum_body \
        plugins/preauth/otp \
        plugins/preauth/pkinit \
        plugins/preauth/test \
+       plugins/preauth/wpse \
        plugins/tls/k5tls \
        kdc kadmin slave clients appl tests \
        config-files build-tools man doc @po@

diff --git a/src/configure.in b/src/configure.in
index ca7709e297a51d0d396558172684018d626f60ab..db8b929efdf9a846e378ee12c6b12ef0078fd4c7 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1210,6 +1210,7 @@ old_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 AC_CHECK_LIB(aceclnt, sd_init, [
             AC_MSG_NOTICE([Enabling RSA securID support])
+            K5_GEN_MAKEFILE(plugins/preauth/securid_sam2)
             sam2_plugin=plugins/preauth/securid_sam2
             ])
 AC_SUBST(sam2_plugin)
@@ -1428,7 +1429,6 @@ dnl       ccapi ccapi/lib ccapi/lib/unix ccapi/server ccapi/server/unix ccapi/test
        plugins/kdb/test
        plugins/preauth/cksum_body
        plugins/preauth/otp
-       plugins/preauth/securid_sam2
        plugins/preauth/test
        plugins/preauth/wpse
        plugins/authdata/greet_client

diff --git a/src/plugins/locate/python/Makefile.in b/src/plugins/locate/python/Makefile.in
index 236e172492502ae8dcae1346a2f80301e8c7a53f..ec474bd6caccfa299e9c8eff9773a2d6bb16245e 100644 (file)
--- a/src/plugins/locate/python/Makefile.in
+++ b/src/plugins/locate/python/Makefile.in
@@ -1,3 +1,6 @@
+# The python locate module is not built by default.  To build it
+# manally, run "make all-liblinks".
+
 mydir=plugins$(S)locate$(S)python
 BUILDTOP=$(REL)..$(S)..$(S)..
 
@@ -14,8 +17,6 @@ SRCS= \
        $(srcdir)/py-locate.c
 STLIBOBJS= py-locate.o
 
-all-unix: all-liblinks
-install-unix: install-libs
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
 @libnover_frag@

diff --git a/src/plugins/preauth/cksum_body/Makefile.in b/src/plugins/preauth/cksum_body/Makefile.in
index 82b2846ab380cc647e3d65944af627de0c0818d7..45cceb7eee5b38fc3bf49d48ff49da5ee5ef2b51 100644 (file)
--- a/src/plugins/preauth/cksum_body/Makefile.in
+++ b/src/plugins/preauth/cksum_body/Makefile.in
@@ -1,3 +1,6 @@
+# The cksum_body preauth module is not built by default.  To build it
+# manually, run "make all-libs".
+
 mydir=plugins$(S)preauth$(S)cksum_body
 BUILDTOP=$(REL)..$(S)..$(S)..
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
@@ -16,8 +19,6 @@ STLIBOBJS=cksum_body_main.o
 
 SRCS= $(srcdir)/cksum_body_main.c
 
-all-unix: $(LIBBASE)$(SO_EXT)
-install-unix: install-libs
 clean-unix:: clean-libs clean-libobjs
 
 @libnover_frag@

diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in
index 7b6ba99abbca3b583dcf56df5c3005c3b26c655e..ab7c74424d04ae1ec190f316b192c083dab871db 100644 (file)
--- a/src/plugins/preauth/wpse/Makefile.in
+++ b/src/plugins/preauth/wpse/Makefile.in
@@ -1,3 +1,6 @@
+# The Worst Preauthentication Scheme Ever is not built by default.  To
+# build it manually, run "make all-libs".
+
 mydir=plugins$(S)preauth$(S)wpse
 BUILDTOP=$(REL)..$(S)..$(S)..
 MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
@@ -16,8 +19,6 @@ STLIBOBJS=wpse_main.o
 
 SRCS=wpse_main.c
 
-all-unix: all-libs
-install-unix: install-libs
 clean-unix:: clean-libs clean-libobjs
 
 @libnover_frag@

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 49e69e12ef21b0e678ec6aa7f59ec84678be23d5..585c78bd5640f6b711e76f08bf1d20b9fa05a712 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,7 +1,7 @@
 mydir=tests
 BUILDTOP=$(REL)..
 SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
-       gss-threads misc
+       gss-threads misc threads
 
 RUN_DB_TEST = $(RUN_SETUP) KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf \
        LC_ALL=C $(VALGRIND)

diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index e8d3e81b3066632075d30070973ebc477f922393..bb1913c1efc9bc8aaac46511ffbf970d6c2e0925 100644 (file)
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -1,3 +1,8 @@
+# The test programs here are not built or run by default.  You can
+# build a specific test program with "make gss-perf" or similar.
+# "make run-t_rcache" will run the replay cache test program in the
+# proper environment.
+
 mydir=tests$(S)threads
 BUILDTOP=$(REL)..$(S)..
 
@@ -29,8 +34,6 @@ init_ctx: init_ctx.o $(KRB5_BASE_DEPLIBS)
 profread: profread.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) $(PTHREAD_CFLAGS) -o profread profread.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
-check-unix: run-t_rcache
-
 install:
 
 clean:

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 9d909f6c57155633d82c08e0093a17be144ff5d7..5452a772ec20e0a526da47e77214ab104ad4c291 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -4,7 +4,8 @@ mydir=util
 # configure scripts, so hide this.
 ##WIN32##!if 0
 SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
-       profile gss-kernel-lib $(MAYBE_VERTO_@VERTO_VERSION@)
+       profile gss-kernel-lib collected-client-lib \
+       $(MAYBE_VERTO_@VERTO_VERSION@)
 ##WIN32##!endif
 WINSUBDIRS=windows support et profile wshelper
 BUILDTOP=$(REL)..

diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index 5671a4107a1dea25b0c774a377568cf7dc8bc72a..606149e456ab5b7e8c9fa12a813140936a1018ab 100644 (file)
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -1,3 +1,6 @@
+# The collected client library is not built by default.  To build it
+# manually, run "make all-libs".
+
 mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
@@ -66,9 +69,6 @@ SHLIB_EXPLIBS= $(LIBS) $(DL_LIB) $(LIBS_UTILS)
 
 DEPLIBS=
 
-#
-all-unix: lib$(LIBBASE)$(SHLIBVEXT)
-
 clean-unix:: clean-libs
 
 #SHLIB_EXPORT_FILE=libcollected.exports