aboutsummaryrefslogtreecommitdiff
path: root/src/kadmin
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-01-10 05:55:49 +0000
committerKen Raeburn <raeburn@mit.edu>2003-01-10 05:55:49 +0000
commitfae39968a963b5ca7c1c98c354bffa6b9b522b5e (patch)
tree017f5c35620f5056ac5873d2a7b6bffc14c62ab2 /src/kadmin
parent6a264aecc07c63e3edd016979183f895353f75ab (diff)
downloadkrb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.zip
krb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.tar.gz
krb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.tar.bz2
Use markers in Makefile.in rather than rules in configure.in to indicate when
to use the lib.in and libobj.in makefile fragments. Pushing this per-directory info into Makefile.in will make it a little easier to work on combining configure scripts for multiple directories. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15107 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/ChangeLog5
-rw-r--r--src/kadmin/configure.in16
2 files changed, 6 insertions, 15 deletions
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index 15f9c4e..b16d876 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* Makefile.ov, config.mk/*: Deleted.
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 28ac06d..48eb0c3 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -72,19 +72,5 @@ AC_SUBST(V4SERVER)
dnl
KRB5_BUILD_PROGRAM
dnl
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(cli)
-K5_GEN_MAKEFILE(dbutil)
-K5_GEN_MAKEFILE(passwd)
-K5_GEN_MAKEFILE(passwd/unit-test)
-K5_GEN_MAKEFILE(ktutil)
-K5_GEN_MAKEFILE(server)
-K5_GEN_MAKEFILE(v4server)
-K5_GEN_MAKEFILE(v4server/unit-test)
-K5_GEN_MAKEFILE(v5passwdd)
-K5_GEN_MAKEFILE(testing)
-K5_GEN_MAKEFILE(testing/scripts)
K5_GEN_FILE(testing/scripts/env-setup.sh:testing/scripts/env-setup.shin)
-K5_GEN_MAKEFILE(testing/util)
-K5_AC_OUTPUT
-
+V5_AC_OUTPUT_MAKEFILE(. cli dbutil passwd passwd/unit-test ktutil server v4server v4server/unit-test v5passwdd testing testing/scripts testing/util)