summaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-01-03 11:07:15 -0500
committerGreg Hudson <ghudson@mit.edu>2013-01-04 01:32:49 -0500
commit5adaa8f50af31056a06934bc219e7f5ca33c1ae5 (patch)
tree297efb51b0d1d093654bd8f558c4a96d06834530 /src/Makefile.in
parent9b702abe222d4b279d5869f96f09074452478b1e (diff)
downloadkrb5-5adaa8f50af31056a06934bc219e7f5ca33c1ae5.tar.gz
krb5-5adaa8f50af31056a06934bc219e7f5ca33c1ae5.tar.xz
krb5-5adaa8f50af31056a06934bc219e7f5ca33c1ae5.zip
Move krb5-config to new src/build-tools directory
In preparation for adding a bunch of pkg-config data files, move krb5-config into a new source tree subdirectory containing tools we provide as outputs to other build systems.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 2c658310f7..da2cfe5577 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@ SUBDIRS=util include lib \
@ldap_plugin_dir@ \
plugins/preauth/pkinit \
kdc kadmin slave clients appl tests \
- config-files man doc @po@
+ config-files build-tools man doc @po@
WINSUBDIRS=include util lib ccapi windows clients appl
BUILDTOP=$(REL).
LOCALINCLUDES = -I$(srcdir)
@@ -29,8 +29,6 @@ HDRS =
DISTFILES = $(SRCS) $(HDRS) COPYING COPYING.LIB ChangeLog Makefile.in
-all-unix:: krb5-config
-
# Lots of things will start to depend on the thread support, which
# needs autoconf.h, but building "all" in include requires that util/et
# have been built first. Until we can untangle this, let's just check
@@ -88,7 +86,7 @@ TAGS: $(SRCS)
clean-:: clean-windows
clean-unix::
- $(RM) *.o core krb5-config
+ $(RM) *.o core
mostlyclean: clean
@@ -533,17 +531,6 @@ install-windows::
-copy clients\kswitch\$(OUTPRE)kswitch.pdb "$(KRB_INSTALL_DIR)\bin\."
copy windows\leash\htmlhelp\*.chm "$(KRB_INSTALL_DIR)\bin\."
-install-unix::
- $(INSTALL_SCRIPT) krb5-config \
- $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
-
-krb5-config: $(srcdir)/krb5-config.in config.status
- $(SHELL) config.status krb5-config
-
-# Test to ensure that krb5-config does not spit out things like
-# $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
-check-unix:: krb5-config
- $(SHELL) $(srcdir)/t_krbconf
check-prerecurse: runenv.py
# Create a test realm and spawn a shell in an environment pointing to it.