krb5 commit: Remove all makefiles in make distclean
Greg Hudson
ghudson at mit.edu
Wed Aug 3 11:10:15 EDT 2016
https://github.com/krb5/krb5/commit/6ee96ccc9b2d50f2959aac1b4f0ff694755c824f
commit 6ee96ccc9b2d50f2959aac1b4f0ff694755c824f
Author: Greg Hudson <ghudson at mit.edu>
Date: Sat Jul 30 14:50:46 2016 -0400
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.
src/Makefile.in | 3 +++
src/configure.in | 2 +-
src/plugins/locate/python/Makefile.in | 5 +++--
src/plugins/preauth/cksum_body/Makefile.in | 5 +++--
src/plugins/preauth/wpse/Makefile.in | 5 +++--
src/tests/Makefile.in | 2 +-
src/tests/threads/Makefile.in | 7 +++++--
src/util/Makefile.in | 3 ++-
src/util/collected-client-lib/Makefile.in | 6 +++---
9 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 15b9cbb..814e5af 100644
--- 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 ca7709e..db8b929 100644
--- 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 236e172..ec474bd 100644
--- 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 82b2846..45cceb7 100644
--- 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 7b6ba99..ab7c744 100644
--- 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 49e69e1..585c78b 100644
--- 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 e8d3e81..bb1913c 100644
--- 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 9d909f6..5452a77 100644
--- 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_ at COM_ERR_VERSION@) $(MAYBE_SS_ at SS_VERSION@) \
- profile gss-kernel-lib $(MAYBE_VERTO_ at VERTO_VERSION@)
+ profile gss-kernel-lib collected-client-lib \
+ $(MAYBE_VERTO_ at 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 5671a41..606149e 100644
--- 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
More information about the cvs-krb5
mailing list