summaryrefslogtreecommitdiffstats
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
parent6a264aecc07c63e3edd016979183f895353f75ab (diff)
downloadkrb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.tar.gz
krb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.tar.xz
krb5-fae39968a963b5ca7c1c98c354bffa6b9b522b5e.zip
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
-rw-r--r--src/ChangeLog14
-rw-r--r--src/aclocal.m417
-rw-r--r--src/appl/ChangeLog5
-rw-r--r--src/appl/configure.in11
-rw-r--r--src/appl/gssftp/ChangeLog5
-rw-r--r--src/appl/gssftp/configure.in5
-rw-r--r--src/clients/ChangeLog5
-rw-r--r--src/clients/configure.in9
-rw-r--r--src/config/ChangeLog10
-rw-r--r--src/config/lib.in45
-rw-r--r--src/config/libobj.in20
-rw-r--r--src/config/pre.in70
-rw-r--r--src/configure.in8
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/configure.in5
-rw-r--r--src/kadmin/ChangeLog5
-rw-r--r--src/kadmin/configure.in16
-rw-r--r--src/krb524/ChangeLog4
-rw-r--r--src/krb524/Makefile.in4
-rw-r--r--src/lib/crypto/ChangeLog7
-rw-r--r--src/lib/crypto/Makefile.in4
-rw-r--r--src/lib/crypto/arcfour/ChangeLog4
-rw-r--r--src/lib/crypto/arcfour/Makefile.in3
-rw-r--r--src/lib/crypto/configure.in16
-rw-r--r--src/lib/crypto/crc32/ChangeLog4
-rw-r--r--src/lib/crypto/crc32/Makefile.in3
-rw-r--r--src/lib/crypto/des/ChangeLog4
-rw-r--r--src/lib/crypto/des/Makefile.in3
-rw-r--r--src/lib/crypto/dk/ChangeLog4
-rw-r--r--src/lib/crypto/dk/Makefile.in3
-rw-r--r--src/lib/crypto/enc_provider/ChangeLog4
-rw-r--r--src/lib/crypto/enc_provider/Makefile.in3
-rw-r--r--src/lib/crypto/hash_provider/ChangeLog4
-rw-r--r--src/lib/crypto/hash_provider/Makefile.in3
-rw-r--r--src/lib/crypto/keyhash_provider/ChangeLog4
-rw-r--r--src/lib/crypto/keyhash_provider/Makefile.in3
-rw-r--r--src/lib/crypto/md4/ChangeLog4
-rw-r--r--src/lib/crypto/md4/Makefile.in3
-rw-r--r--src/lib/crypto/md5/ChangeLog4
-rw-r--r--src/lib/crypto/md5/Makefile.in3
-rw-r--r--src/lib/crypto/old/ChangeLog4
-rw-r--r--src/lib/crypto/old/Makefile.in3
-rw-r--r--src/lib/crypto/raw/ChangeLog4
-rw-r--r--src/lib/crypto/raw/Makefile.in3
-rw-r--r--src/lib/crypto/sha1/ChangeLog4
-rw-r--r--src/lib/crypto/sha1/Makefile.in3
-rw-r--r--src/lib/crypto/yarrow/ChangeLog4
-rw-r--r--src/lib/crypto/yarrow/Makefile.in3
-rw-r--r--src/lib/des425/ChangeLog4
-rw-r--r--src/lib/des425/Makefile.in4
-rw-r--r--src/lib/gssapi/ChangeLog7
-rw-r--r--src/lib/gssapi/Makefile.in4
-rw-r--r--src/lib/gssapi/configure.in5
-rw-r--r--src/lib/gssapi/generic/ChangeLog4
-rw-r--r--src/lib/gssapi/generic/Makefile.in3
-rw-r--r--src/lib/gssapi/krb5/ChangeLog4
-rw-r--r--src/lib/gssapi/krb5/Makefile.in3
-rw-r--r--src/lib/kadm5/ChangeLog7
-rw-r--r--src/lib/kadm5/Makefile.in3
-rw-r--r--src/lib/kadm5/clnt/ChangeLog4
-rw-r--r--src/lib/kadm5/clnt/Makefile.in4
-rw-r--r--src/lib/kadm5/configure.in7
-rw-r--r--src/lib/kadm5/srv/ChangeLog4
-rw-r--r--src/lib/kadm5/srv/Makefile.in4
-rw-r--r--src/lib/kdb/ChangeLog4
-rw-r--r--src/lib/kdb/Makefile.in4
-rw-r--r--src/lib/krb4/ChangeLog4
-rw-r--r--src/lib/krb4/Makefile.in4
-rw-r--r--src/lib/krb5/ChangeLog7
-rw-r--r--src/lib/krb5/Makefile.in4
-rw-r--r--src/lib/krb5/asn.1/ChangeLog4
-rw-r--r--src/lib/krb5/asn.1/Makefile.in3
-rw-r--r--src/lib/krb5/ccache/ChangeLog4
-rw-r--r--src/lib/krb5/ccache/Makefile.in3
-rw-r--r--src/lib/krb5/configure.in11
-rw-r--r--src/lib/krb5/error_tables/ChangeLog4
-rw-r--r--src/lib/krb5/error_tables/Makefile.in3
-rw-r--r--src/lib/krb5/keytab/ChangeLog4
-rw-r--r--src/lib/krb5/keytab/Makefile.in3
-rw-r--r--src/lib/krb5/krb/ChangeLog4
-rw-r--r--src/lib/krb5/krb/Makefile.in3
-rw-r--r--src/lib/krb5/os/ChangeLog4
-rw-r--r--src/lib/krb5/os/Makefile.in3
-rw-r--r--src/lib/krb5/posix/ChangeLog4
-rw-r--r--src/lib/krb5/posix/Makefile.in1
-rw-r--r--src/lib/krb5/rcache/ChangeLog4
-rw-r--r--src/lib/krb5/rcache/Makefile.in3
-rw-r--r--src/lib/rpc/ChangeLog7
-rw-r--r--src/lib/rpc/Makefile.in4
-rw-r--r--src/lib/rpc/configure.in3
-rw-r--r--src/tests/ChangeLog5
-rw-r--r--src/tests/configure.in10
-rw-r--r--src/util/db2/ChangeLog10
-rw-r--r--src/util/db2/Makefile.in1
-rw-r--r--src/util/db2/btree/Makefile.in1
-rw-r--r--src/util/db2/clib/Makefile.in1
-rw-r--r--src/util/db2/configure.in10
-rw-r--r--src/util/db2/db/Makefile.in1
-rw-r--r--src/util/db2/hash/Makefile.in1
-rw-r--r--src/util/db2/mpool/Makefile.in1
-rw-r--r--src/util/db2/recno/Makefile.in1
-rw-r--r--src/util/et/ChangeLog4
-rw-r--r--src/util/et/Makefile.in4
-rw-r--r--src/util/profile/ChangeLog7
-rw-r--r--src/util/profile/Makefile.in4
-rw-r--r--src/util/profile/configure.in5
-rw-r--r--src/util/pty/ChangeLog4
-rw-r--r--src/util/pty/Makefile.in4
-rw-r--r--src/util/ss/ChangeLog4
-rw-r--r--src/util/ss/Makefile.in4
110 files changed, 458 insertions, 182 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5c2850219d..fc80ca90c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * aclocal.m4 (CONFIG_RULES): Substitute files for @lib_frag@ and
+ @libobj_frag@ markers.
+ (V5_SET_TOPDIR): Don't define krb5_append_frags.
+ (KRB5_BUILD_LIBRARY, KRB5_BUILD_LIBRARY_WITH_DEPS,
+ KRB5_BUILD_LIBOBJS): Don't redefine krb5_append_frags.
+ (_V5_AC_OUTPUT_MAKEFILE): Don't use krb5_append_frags.
+ (_K5_GEN_MAKEFILE): Don't process second argument specifying
+ makefile fragments.
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
2002-12-23 Tom Yu <tlyu@mit.edu>
* aclocal.m4 (WITH_KRB4): Substitute some variables for generated
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3933b0dc9b..5d95b04f14 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1,5 +1,5 @@
AC_PREREQ(2.52)
-AC_COPYRIGHT([Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+AC_COPYRIGHT([Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
Massachusetts Institute of Technology.
])
dnl
@@ -35,7 +35,6 @@ ac_topdir=$srcdir/$ac_reltopdir
ac_config_fragdir=$ac_reltopdir/config
krb5_pre_in=$ac_config_fragdir/pre.in
krb5_post_in=$ac_config_fragdir/post.in
-define([krb5_append_frags],[$krb5_post_in])
echo "Looking for $srcdir/$ac_config_fragdir"
if test -d "$srcdir/$ac_config_fragdir"; then
AC_CONFIG_AUX_DIR($ac_config_fragdir)
@@ -97,6 +96,10 @@ dnl
CONFIG_RELTOPDIR=$ac_reltopdir
AC_SUBST(CONFIG_RELTOPDIR)
AC_SUBST(subdirs)
+lib_frag=$srcdir/$ac_config_fragdir/lib.in
+AC_SUBST_FILE(lib_frag)
+libobj_frag=$srcdir/$ac_config_fragdir/libobj.in
+AC_SUBST_FILE(libobj_frag)
])dnl
dnl This is somewhat gross and should go away when the build system
@@ -559,7 +562,7 @@ dnl Note: Be careful in quoting.
dnl The ac_foreach generates the list of fragments to include
dnl or "" if $2 is empty
AC_DEFUN(_K5_GEN_MAKEFILE,[dnl
-AC_CONFIG_FILES([$1/Makefile:$krb5_pre_in:$1/Makefile.in]AC_FOREACH([FRAG], [$2], :$ac_config_fragdir/[FRAG].in)[:$krb5_post_in])
+AC_CONFIG_FILES([$1/Makefile:$krb5_pre_in:$1/Makefile.in:$krb5_post_in])
])
dnl
dnl K5_GEN_FILE( <ac_output arguments> )
@@ -584,7 +587,7 @@ dnl
define(_V5_AC_OUTPUT_MAKEFILE,
[ifelse($2, , ,AC_CONFIG_FILES($2))
AC_FOREACH([DIR], [$1],dnl
- [AC_CONFIG_FILES(DIR[/Makefile:$krb5_pre_in:]DIR[/Makefile.in:]krb5_append_frags)])
+ [AC_CONFIG_FILES(DIR[/Makefile:$krb5_pre_in:]DIR[/Makefile.in:$krb5_post_in])])
K5_AC_OUTPUT])dnl
dnl
dnl
@@ -998,8 +1001,6 @@ AC_DEFUN(KRB5_BUILD_LIBRARY,
AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_CHECK_PROG(AR, ar, ar, false)
-# add frag for building libraries
-define([krb5_append_frags],[$ac_config_fragdir/lib.in:]krb5_append_frags)
# null out SHLIB_EXPFLAGS because we lack any dependencies
SHLIB_EXPFLAGS=
AC_SUBST(LIBLIST)
@@ -1042,8 +1043,6 @@ AC_DEFUN(KRB5_BUILD_LIBRARY_WITH_DEPS,
AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_CHECK_PROG(AR, ar, ar, false)
-# add frag for building libraries
-define([krb5_append_frags],[$ac_config_fragdir/lib.in:]krb5_append_frags)
AC_SUBST(LIBLIST)
AC_SUBST(LIBLINKS)
AC_SUBST(LDCOMBINE)
@@ -1064,8 +1063,6 @@ dnl Pull in the necessary stuff to build library objects.
AC_DEFUN(KRB5_BUILD_LIBOBJS,
[AC_REQUIRE([KRB5_LIB_AUX])dnl
-# add frag for building library objects
-define([krb5_append_frags],[$ac_config_fragdir/libobj.in:]krb5_append_frags)
AC_SUBST(OBJLISTS)
AC_SUBST(STOBJEXT)
AC_SUBST(SHOBJEXT)
diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog
index 6f0342b3ad..572f2b3810 100644
--- a/src/appl/ChangeLog
+++ b/src/appl/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.
+
2002-08-23 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
diff --git a/src/appl/configure.in b/src/appl/configure.in
index 9f9886ed17..ab7559f5e3 100644
--- a/src/appl/configure.in
+++ b/src/appl/configure.in
@@ -15,13 +15,4 @@ KRB5_GETSOCKNAME_ARGS
KRB5_GETPEERNAME_ARGS
KRB5_BUILD_PROGRAM
AC_CONFIG_SUBDIRS(bsd gssftp telnet)
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(sample)
-K5_GEN_MAKEFILE(sample/sclient)
-K5_GEN_MAKEFILE(sample/sserver)
-K5_GEN_MAKEFILE(simple)
-K5_GEN_MAKEFILE(simple/client)
-K5_GEN_MAKEFILE(simple/server)
-K5_GEN_MAKEFILE(gss-sample)
-K5_GEN_MAKEFILE(user_user)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. sample sample/sclient sample/sserver simple simple/client simple/server gss-sample user_user)
diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog
index c63cf5a91e..9f184f73c1 100644
--- a/src/appl/gssftp/ChangeLog
+++ b/src/appl/gssftp/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.
+
2002-12-06 Ezra Peisach <epeisach@bu.edu>
* configure.in: Quote the argument to AC_CHECK_HEADER. Autoconf
diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in
index a25e124a24..35ca40eb02 100644
--- a/src/appl/gssftp/configure.in
+++ b/src/appl/gssftp/configure.in
@@ -82,7 +82,4 @@ dnl
dnl
dnl
KRB5_BUILD_PROGRAM
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(ftp)
-K5_GEN_MAKEFILE(ftpd)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. ftp ftpd)
diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog
index 72b71c0be3..557ace32f6 100644
--- a/src/clients/ChangeLog
+++ b/src/clients/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.
+
2002-08-23 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
diff --git a/src/clients/configure.in b/src/clients/configure.in
index a10071bfe7..9d99d058bd 100644
--- a/src/clients/configure.in
+++ b/src/clients/configure.in
@@ -21,11 +21,4 @@ alpha*-dec-osf*)
;;
esac
AC_SUBST(KSU_LIBS)
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(klist)
-K5_GEN_MAKEFILE(kinit)
-K5_GEN_MAKEFILE(kvno)
-K5_GEN_MAKEFILE(kdestroy)
-K5_GEN_MAKEFILE(kpasswd)
-K5_GEN_MAKEFILE(ksu)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. klist kinit kvno kdestroy kpasswd ksu)
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index d5f7cc69e8..f4457e686f 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * lib.in (LN_S, AR, LIBLIST, LIBLINKS, LIBINSTLIST, STLIBEXT,
+ SHLIBVEXT, SHLIBSEXT, SHLIBEXT, PFLIBEXT, LDCOMBINE,
+ LDCOMBINE_TAIL, SHLIB_EXPFLAGS): Move these autoconf-substituted
+ variables...
+ * libobj.in (OBJLISTS, SHLIBOBJS, PFLIBOBJS, LDCOMBINE, SONAME,
+ PICFLAGS, PROFFLAGS): ...and these...
+ * pre.in: ...to here.
+
2002-12-23 Tom Yu <tlyu@mit.edu>
* pre.in: Add variables for krb524 and krb4 generated headers for
diff --git a/src/config/lib.in b/src/config/lib.in
index 7d7bc71497..95d938fd25 100644
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -23,51 +23,6 @@
# form dir1:dir2 ...
# RELDIR path to this directory relative to $(TOPLIBD)
-## Parameters to be set by configure:
-##
-
-LN_S=@LN_S@
-AR=@AR@
-
-# Set to "lib$(LIB)$(STEXT) lib$(LIB)$(SHEXT) lib$(LIB)$(PFEXT)" or
-# some subset thereof by configure; determines which types of libs get
-# built.
-LIBLIST=@LIBLIST@
-
-# Set by configure; list of library symlinks to make to $(TOPLIBD)
-LIBLINKS=@LIBLINKS@
-
-# Set by configure; list of install targets
-LIBINSTLIST=@LIBINSTLIST@
-
-# Some of these should really move to pre.in, since programs will need
-# it too. (e.g. stuff that has dependencies on the libraries)
-
-# usually .a
-STLIBEXT=@STLIBEXT@
-
-# usually .so.$(LIBMAJOR).$(LIBMINOR)
-SHLIBVEXT=@SHLIBVEXT@
-
-# usually .so.$(LIBMAJOR) (to allow for major-version compat)
-SHLIBSEXT=@SHLIBSEXT@
-
-# usually .so
-SHLIBEXT=@SHLIBEXT@
-
-# usually _p.a
-PFLIBEXT=@PFLIBEXT@
-
-# "cc -G", "ld -Bshareable", etc.
-LDCOMBINE=@LDCOMBINE@
-
-# Misc args to tack on the tail of LDCOMBINE
-LDCOMBINE_TAIL=@LDCOMBINE_TAIL@
-
-# flags for explicit libraries depending on this one,
-# e.g. "-R$(SHLIB_RPATH) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
-SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
-
# STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
diff --git a/src/config/libobj.in b/src/config/libobj.in
index 2cc63bd186..7a5fb06ca5 100644
--- a/src/config/libobj.in
+++ b/src/config/libobj.in
@@ -7,26 +7,6 @@
# STLIBOBJS list of .o objects; this must not contain variable
# references.
-# Set to "OBJS.ST OBJS.SH OBJS.PF" or some subset thereof by
-# configure; determines which types of object files get built.
-OBJLISTS=@OBJLISTS@
-
-# Note that $(LIBSRCS) *cannot* contain any variable references, or
-# the suffix substitution will break on some platforms!
-SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
-PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
-
-# "$(CC) -G", "$(LD) -Bshareable", etc.
-LDCOMBINE=@LDCOMBINE@
-
-# "-h $@", "-h lib$(LIBNAME).$(LIBMAJOR)", etc.
-SONAME=@SONAME@
-
-#
-# rules to make various types of object files
-#
-PICFLAGS=@PICFLAGS@
-PROFFLAGS=@PROFFLAGS@
.SUFFIXES: .c .so .po
.c.so:
$(CC) $(DEFS) $(DEFINES) $(PICFLAGS) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.so.o && \
diff --git a/src/config/pre.in b/src/config/pre.in
index 8c8dcc14ea..9d9b8776b5 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -417,6 +417,76 @@ MAKE_COMMANDS-k5= $(BUILDTOP)/util/ss/mk_cmds
.ct.c:
$(MAKE_COMMANDS) $<
+## Parameters to be set by configure for use in lib.in:
+##
+
+LN_S=@LN_S@
+AR=@AR@
+
+# Set to "lib$(LIB)$(STEXT) lib$(LIB)$(SHEXT) lib$(LIB)$(PFEXT)" or
+# some subset thereof by configure; determines which types of libs get
+# built.
+LIBLIST=@LIBLIST@
+
+# Set by configure; list of library symlinks to make to $(TOPLIBD)
+LIBLINKS=@LIBLINKS@
+
+# Set by configure; list of install targets
+LIBINSTLIST=@LIBINSTLIST@
+
+# Some of these should really move to pre.in, since programs will need
+# it too. (e.g. stuff that has dependencies on the libraries)
+
+# usually .a
+STLIBEXT=@STLIBEXT@
+
+# usually .so.$(LIBMAJOR).$(LIBMINOR)
+SHLIBVEXT=@SHLIBVEXT@
+
+# usually .so.$(LIBMAJOR) (to allow for major-version compat)
+SHLIBSEXT=@SHLIBSEXT@
+
+# usually .so
+SHLIBEXT=@SHLIBEXT@
+
+# usually _p.a
+PFLIBEXT=@PFLIBEXT@
+
+# "cc -G", "ld -Bshareable", etc.
+LDCOMBINE=@LDCOMBINE@
+
+# Misc args to tack on the tail of LDCOMBINE
+LDCOMBINE_TAIL=@LDCOMBINE_TAIL@
+
+# flags for explicit libraries depending on this one,
+# e.g. "-R$(SHLIB_RPATH) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
+SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
+
+## Parameters to be set by configure for use in libobj.in:
+
+# Set to "OBJS.ST OBJS.SH OBJS.PF" or some subset thereof by
+# configure; determines which types of object files get built.
+OBJLISTS=@OBJLISTS@
+
+# Note that $(LIBSRCS) *cannot* contain any variable references, or
+# the suffix substitution will break on some platforms!
+SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@)
+PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
+
+# "$(CC) -G", "$(LD) -Bshareable", etc.
+LDCOMBINE=@LDCOMBINE@
+
+# "-h $@", "-h lib$(LIBNAME).$(LIBMAJOR)", etc.
+SONAME=@SONAME@
+
+#
+# rules to make various types of object files
+#
+PICFLAGS=@PICFLAGS@
+PROFFLAGS=@PROFFLAGS@
+
+
+
##
## end of pre.in
############################################################
diff --git a/src/configure.in b/src/configure.in
index 233ec1d021..98d3293f87 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -80,10 +80,4 @@ if test -n "$KRB4_LIB"; then
fi
AC_CONFIG_SUBDIRS(kdc kadmin slave clients appl tests)
AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(util)
-K5_GEN_MAKEFILE(util/send-pr)
-K5_GEN_MAKEFILE(lib)
-K5_GEN_MAKEFILE(config-files)
-K5_GEN_MAKEFILE(gen-manpages)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. util util/send-pr lib config-files gen-manpages)
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 3c165d474d..269b7fc809 100644
--- a/src/include/ChangeLog
+++ b/src/include/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-09 Ken Raeburn <raeburn@mit.edu>
* fake-addrinfo.h (getaddrinfo) [_AIX]: Always overwrite sa_family
diff --git a/src/include/configure.in b/src/include/configure.in
index e54dedabbd..5d6eec4d10 100644
--- a/src/include/configure.in
+++ b/src/include/configure.in
@@ -192,7 +192,4 @@ else
AC_DEFINE(KRB5_KRB4_COMPAT,1,[Define if Kerberos V4 backwards compatibility should be supported])
fi
dnl
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(krb5)
-K5_GEN_MAKEFILE(kerberosIV)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. krb5 kerberosIV)
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index 15f9c4e6ce..b16d876427 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 28ac06ddef..48eb0c32ad 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)
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 2ea85862e1..237ba8103b 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-12-06 Tom Yu <tlyu@mit.edu>
* sendmsg.c (krb524_sendto_kdc): Update calls to locate_server()
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index eba2cc9a83..6def93295a 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -158,6 +158,10 @@ clean-unix:: clean-libs clean-libobjs
$(RM) krb524test krb524d k524init test.o krb524d.o k524init.o
$(RM) $(BUILDTOP)/include/krb524.h $(BUILDTOP)/include/krb524_err.h
+
+# @libobj_frag@
+# @lib_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index a3ffa7b399..441beacd82 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* pbkdf2.c, t_encrypt.c, t_hmac.c, t_nfold.c: Cleanup unused
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index c2a249a646..d50418ca8a 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -319,6 +319,10 @@ check-windows::
$(MAKE) -$(MFLAGS) check
cd ..
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/arcfour/ChangeLog b/src/lib/crypto/arcfour/ChangeLog
index 6526488201..5bc717d2d1 100644
--- a/src/lib/crypto/arcfour/ChangeLog
+++ b/src/lib/crypto/arcfour/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in
index 8cfce45936..8c33066b9b 100644
--- a/src/lib/crypto/arcfour/Makefile.in
+++ b/src/lib/crypto/arcfour/Makefile.in
@@ -35,6 +35,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 16dda7b6d1..a3b8b02bc6 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -18,18 +18,4 @@ AC_ARG_ENABLE([athena],
-- here meaning use temporary DES3 etype that
includes 32-bit length codings],
[AC_DEFINE(ATHENA_DES3_KLUDGE)],)
-K5_GEN_MAKEFILE(., lib libobj)
-K5_GEN_MAKEFILE(crc32, libobj)
-K5_GEN_MAKEFILE(des, libobj)
-K5_GEN_MAKEFILE(dk, libobj)
-K5_GEN_MAKEFILE(enc_provider, libobj)
-K5_GEN_MAKEFILE(hash_provider, libobj)
-K5_GEN_MAKEFILE(keyhash_provider, libobj)
-K5_GEN_MAKEFILE(md4, libobj)
-K5_GEN_MAKEFILE(md5, libobj)
-K5_GEN_MAKEFILE(old, libobj)
-K5_GEN_MAKEFILE(raw, libobj)
-K5_GEN_MAKEFILE(sha1, libobj)
-K5_GEN_MAKEFILE(arcfour, libobj)
-K5_GEN_MAKEFILE(yarrow, libobj)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. crc32 des dk enc_provider hash_provider keyhash_provider md4 md5 old raw sha1 arcfour yarrow)
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 256c9ea26e..43ef10f87d 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* t_crc.c: Declare local functions static.
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 8af8831269..09d24047e3 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -36,6 +36,9 @@ check-unix:: t_crc
t_crc: t_crc.o crc32.o
$(CC_LINK) -o $@ t_crc.o crc32.o
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 7a8d1d8b70..099eb84733 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* t_verify.c: Signed vs. unsigned cleanups. Remove unsused variables.
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index ee0e7a6252..f8065d7efd 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -90,6 +90,9 @@ clean::
t_verify.$(OBJEXT) t_afss2k.$(OBJEXT) t_afss2k$(EXEEXT)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index b5d9d4d57e..df04069a95 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index 7e4bccb345..3785ad6f82 100644
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -44,6 +44,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index ee41e13eca..ee01521159 100644
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index 0a9087a135..bb444110e3 100644
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -35,6 +35,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/hash_provider/ChangeLog b/src/lib/crypto/hash_provider/ChangeLog
index 69e9417c31..12e5dfc2a6 100644
--- a/src/lib/crypto/hash_provider/ChangeLog
+++ b/src/lib/crypto/hash_provider/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 48386a55f3..55aa8922e6 100644
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -32,6 +32,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog
index 67f1f85ff6..9e6a153ed0 100644
--- a/src/lib/crypto/keyhash_provider/ChangeLog
+++ b/src/lib/crypto/keyhash_provider/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* t_cksum.c: Cleanup (potential) variable used before set warning.
diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index ddb1828d6e..27c3821fd7 100644
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -51,6 +51,9 @@ clean-unix::
$(RM) t_cksum5 t_cksum5.o
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 1d32152f02..af839b8112 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 2e45bb63d1..af05935261 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -53,6 +53,9 @@ clean::
$(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) t_mddriver.c
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index 973782c588..c88c95ab7c 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 20af1f8de6..b7838934f9 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -43,6 +43,9 @@ clean::
$(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index 36d0f44009..0cdd659318 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index d2eac1ce7f..8fc8390e5a 100644
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -30,6 +30,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog
index 39412eef0c..ce3bdc853b 100644
--- a/src/lib/crypto/raw/ChangeLog
+++ b/src/lib/crypto/raw/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in
index 0aa4c2e9f1..d94112b6a9 100644
--- a/src/lib/crypto/raw/Makefile.in
+++ b/src/lib/crypto/raw/Makefile.in
@@ -28,6 +28,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog
index e3444481d7..cb2c5aee13 100644
--- a/src/lib/crypto/sha1/ChangeLog
+++ b/src/lib/crypto/sha1/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* t_shs3.c: Signed/unsigned cleanup. Provide function prototypes.
diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in
index f362c70bc1..da3e70fa3c 100644
--- a/src/lib/crypto/sha1/Makefile.in
+++ b/src/lib/crypto/sha1/Makefile.in
@@ -48,6 +48,9 @@ clean-unix:: clean-libobjs
t_shs3: t_shs3.o shs.o
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_shs3 t_shs3.o shs.o
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog
index 0c40af605f..73bc53c615 100644
--- a/src/lib/crypto/yarrow/ChangeLog
+++ b/src/lib/crypto/yarrow/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in
index 4c8331d5b3..efae363642 100644
--- a/src/lib/crypto/yarrow/Makefile.in
+++ b/src/lib/crypto/yarrow/Makefile.in
@@ -34,6 +34,9 @@ includes:: depend
depend:: $(SRCS)
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 6b36d425f9..a2557cc42d 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-10-10 Sam Hartman <hartmans@mit.edu>
* read_passwd.c : Implement in terms of krb5_prompter_posix
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 0df13e8710..dc486f32b6 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -108,6 +108,10 @@ clean::
clean-unix:: clean-liblinks clean-libs clean-libobjs
install-unix:: install-libs
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index d100b537a2..e0afb9dd8c 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* Makefile.original: Deleted.
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 758d198bcb..51b030c736 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -72,6 +72,10 @@ clean-windows::
$(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h: all-recurse
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index 130cd2a66d..dc6e68a0f9 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -14,7 +14,4 @@ AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
KRB5_BUILD_LIBOBJS
KRB5_BUILD_LIBRARY_WITH_DEPS
-K5_GEN_MAKEFILE(., lib libobj)
-K5_GEN_MAKEFILE(generic, libobj)
-K5_GEN_MAKEFILE(krb5, libobj)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. generic krb5)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index f22b99b8a2..6c065c65e2 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* Makefile.original: Deleted.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 513d7ae092..7a22d9aad8 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -131,6 +131,9 @@ install-headers-unix install:: gssapi.h
done
depend:: $(ETSRCS)
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 506b95870a..9be23de8b9 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Sam Hartman <hartmans@mit.edu>
* init_sec_context.c (make_gss_checksum): New function to
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 2a2a7a3edf..a7782e7399 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -210,6 +210,9 @@ depend:: $(ETSRCS)
includes::
install::
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 33fa3256d0..6e11b937d4 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* Makefile.ov: Deleted.
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index f6abe94286..9546a6b220 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -103,6 +103,9 @@ clean-unix:: clean-libobjs
clean-mac::
clean-windows::
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 7d393c0b36..43b3528801 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-10-08 Tom Yu <tlyu@mit.edu>
* Makefile.in (LIBMINOR): Bump.
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 3e4fb8cf2f..f198840a6c 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -68,6 +68,10 @@ clean-windows::
clean-unix:: clean-liblinks clean-libs clean-libobjs
install:: install-libs
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
index 79875491ab..a83ddd3b6c 100644
--- a/src/lib/kadm5/configure.in
+++ b/src/lib/kadm5/configure.in
@@ -24,9 +24,4 @@ KRB5_BUILD_LIBOBJS
KRB5_BUILD_LIBRARY_WITH_DEPS
KRB5_BUILD_PROGRAM
dnl
-K5_GEN_MAKEFILE(., libobj)
-K5_GEN_MAKEFILE(clnt, lib libobj)
-K5_GEN_MAKEFILE(srv, lib libobj)
-K5_GEN_MAKEFILE(unit-test)
-K5_AC_OUTPUT
-
+V5_AC_OUTPUT_MAKEFILE(. clnt srv unit-test)
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 106c2bee7b..61b48f8701 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-05 Sam Hartman <hartmans@mit.edu>
* server_dict.c: Remove declaration of errno
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 54317f67a8..80f9be241f 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -97,6 +97,10 @@ clean-windows::
clean-unix:: clean-liblinks clean-libs clean-libobjs
install:: install-libs
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 00f30dd92d..95f7a01b6c 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* setup_mkey.c (krb5_db_setup_mkey_name): Use size_t instead of
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 9babe18e95..0afd963ece 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -66,6 +66,10 @@ check:: t_kdb
clean::
$(RM) t_kdb t_kdb.o
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 0b0a976c8f..a41da02bf3 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-05 Sam Hartman <hartmans@mit.edu>
* tf_util.c: Remove declaration of errno
diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index e9675439c7..bdb43f4674 100644
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -249,6 +249,10 @@ check-windows::
install-unix:: install-libs
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index bc6ed4142b..70d36ef840 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index b0666883e2..9530e0db48 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -121,6 +121,10 @@ clean-windows::
@echo Making clean locally
install-unix:: install-libs
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 533eb9b442..50524055cf 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-12-23 Ezra Peisach <epeisach@bu.edu>
* asn1_k_decode.c (asn1_decode_sam_challenge_2_body): Add
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index e5c7f4d00f..6757046cb0 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -51,6 +51,9 @@ OBJS= \
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 3cb606700e..70a48c6f79 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* cc_file.c (krb5_cc_file_ops, krb5_fcc_ops): Now const.
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index c035dda9db..bbf61bebb9 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -98,6 +98,9 @@ clean-unix::
$(RM) t_cc t_cc.o
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 7976da0b1f..666a8194f5 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -23,13 +23,4 @@ KRB5_BUILD_LIBOBJS
KRB5_BUILD_PROGRAM
KRB5_RUN_FLAGS
dnl
-K5_GEN_MAKEFILE(., lib libobj)
-K5_GEN_MAKEFILE(error_tables, libobj)
-K5_GEN_MAKEFILE(asn.1, libobj)
-K5_GEN_MAKEFILE(ccache, libobj)
-K5_GEN_MAKEFILE(keytab, libobj)
-K5_GEN_MAKEFILE(krb, libobj)
-K5_GEN_MAKEFILE(rcache, libobj)
-K5_GEN_MAKEFILE(os, libobj)
-K5_GEN_MAKEFILE(posix, libobj)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. error_tables asn.1 ccache keytab krb rcache os posix)
diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index fbe89eda5c..cb4b2d5d0e 100644
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-11-14 Tom Yu <tlyu@mit.edu>
* Makefile.in: Remove references to adm_err.et. It's not used,
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 32f118a0da..da1f770672 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -59,6 +59,9 @@ $(OUTPRE)kv5m_err.$(OBJEXT): kv5m_err.c
clean-unix:: clean-libobjs
$(RM) $(HDRS) $(ETSRCS)
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 7112d7f90b..7a7e19dccd 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2002-10-31 Ken Raeburn <raeburn@mit.edu>
* kt_file.c (krb5_ktf_ops, krb5_ktf_writable_ops): Now const.
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 444292f3f4..545cd27849 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -54,6 +54,9 @@ clean-windows::
@echo Making clean in krb5\keytab
$(RM) $(OBJFILE)
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 452950b8dd..eec37644b7 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-09 Sam Hartman <hartmans@mit.edu>
* get_creds.c (krb5_get_credentials_core): Patch from Ben Cox
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 0ddaaf2451..18627b12a3 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -357,6 +357,9 @@ clean::
$(OUTPRE)t_ser$(EXEEXT) $(OUTPRE)t_ser.$(OBJEXT) \
$(OUTPRE)t_deltat$(EXEEXT) $(OUTPRE)t_deltat.$(OBJEXT) \
$(OUTPRE)t_expand$(EXEEXT) $(OUTPRE)t_expand.$(OBJEXT)
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 28e9e1a17d..c584603003 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* sendto_kdc.c (state_strings): Now const.
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index c440848243..acd37b22cb 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -225,6 +225,9 @@ check-unix::
clean::
$(RM) $(TEST_PROGS) test.out t_std_conf.o t_an_to_ln.o
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 0a2cb1c817..f56968aed3 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-05 Sam Hartman <hartmans@mit.edu>
* syslog.c (vsyslog): Remove declaration of errno
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index bcada86fa0..f7b8199bd5 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -18,3 +18,4 @@ clean-unix:: clean-libobjs
##WIN16##LIBOBJS = syslog.obj sscanf.obj
##WIN32##LIBOBJS = $(OUTPRE)syslog.obj
+# @libobj_frag@
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 5172c6615b..f6d0a227d3 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* rc_base.c (struct krb5_rc_typelist): Field "ops" now points to
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 9808e14898..79b6a282ec 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -39,6 +39,9 @@ SRCS= \
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index ac3f582199..13d61681e2 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-07 Ken Raeburn <raeburn@mit.edu>
* Makefile.ov: Deleted.
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 47ed6a0a7b..73c42a00ab 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -260,6 +260,10 @@ clean-windows::
$(HDRS): includes
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in
index 06b8cad97f..6bdacc2a87 100644
--- a/src/lib/rpc/configure.in
+++ b/src/lib/rpc/configure.in
@@ -76,6 +76,5 @@ AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent)
DECLARE_SYS_ERRLIST
KRB5_BUILD_LIBOBJS
KRB5_BUILD_LIBRARY_WITH_DEPS
-K5_GEN_MAKEFILE(., lib libobj)
K5_GEN_FILE(types.h:types.hin)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index ecee3c2ae4..7ed1b8ae10 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/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.
+
2002-09-24 Ezra Peisach <epeisach@bu.edu>
* Makefile.in (mydir): Add missing mydir lines.
diff --git a/src/tests/configure.in b/src/tests/configure.in
index 68dc5fb350..205eb1dc41 100644
--- a/src/tests/configure.in
+++ b/src/tests/configure.in
@@ -26,12 +26,4 @@ else
KRB4_DEJAGNU_TEST="KRBIV=1"
fi
AC_SUBST(KRB4_DEJAGNU_TEST)
-K5_GEN_MAKEFILE(.)
-K5_GEN_MAKEFILE(resolve)
-K5_GEN_MAKEFILE(asn.1)
-K5_GEN_MAKEFILE(create)
-K5_GEN_MAKEFILE(hammer)
-K5_GEN_MAKEFILE(verify)
-K5_GEN_MAKEFILE(gssapi)
-K5_GEN_MAKEFILE(dejagnu)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. resolve asn.1 create hammer verify gssapi dejagnu)
diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog
index acbfb104e1..56b4a94325 100644
--- a/src/util/db2/ChangeLog
+++ b/src/util/db2/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag.
+ * btree/Makefile.in, clib/Makefile.in, db/Makefile.in,
+ hash/Makefile.in, mpool/Makefile.in, recno/Makefile.in: Add
+ AC_SUBST_FILE marker for libobj_frag.
+
2003-01-05 Sam Hartman <hartmans@mit.edu>
* clib/mkstemp.c (_gettemp): Remove declaration of errno
diff --git a/src/util/db2/Makefile.in b/src/util/db2/Makefile.in
index 6b772a0f83..0d4634ff07 100644
--- a/src/util/db2/Makefile.in
+++ b/src/util/db2/Makefile.in
@@ -30,3 +30,4 @@ $(HDRDIR)/db-ndbm.h: $(srcdir)/include/db-ndbm.h
clean-includes::
$(RM) $(HDRS)
+# @lib_frag@
diff --git a/src/util/db2/btree/Makefile.in b/src/util/db2/btree/Makefile.in
index ac8efa1b58..d3b02652a6 100644
--- a/src/util/db2/btree/Makefile.in
+++ b/src/util/db2/btree/Makefile.in
@@ -11,3 +11,4 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/db2/clib/Makefile.in b/src/util/db2/clib/Makefile.in
index cd738626be..3f3d2b8be4 100644
--- a/src/util/db2/clib/Makefile.in
+++ b/src/util/db2/clib/Makefile.in
@@ -8,3 +8,4 @@ LOCALINCLUDES=-I../include
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/db2/configure.in b/src/util/db2/configure.in
index a156d69e42..6d07853755 100644
--- a/src/util/db2/configure.in
+++ b/src/util/db2/configure.in
@@ -89,12 +89,4 @@ KRB5_BUILD_LIBRARY
KRB5_BUILD_LIBOBJS
KRB5_BUILD_PROGRAM
KRB5_RUN_FLAGS
-K5_GEN_MAKEFILE(., lib)
-K5_GEN_MAKEFILE(hash, libobj)
-K5_GEN_MAKEFILE(btree, libobj)
-K5_GEN_MAKEFILE(db, libobj)
-K5_GEN_MAKEFILE(mpool, libobj)
-K5_GEN_MAKEFILE(recno, libobj)
-K5_GEN_MAKEFILE(clib, libobj)
-K5_GEN_MAKEFILE(test)
-K5_AC_OUTPUT
+V5_AC_OUTPUT_MAKEFILE(. hash btree db mpool recno clib test)
diff --git a/src/util/db2/db/Makefile.in b/src/util/db2/db/Makefile.in
index e9d51e55be..b173b0d79e 100644
--- a/src/util/db2/db/Makefile.in
+++ b/src/util/db2/db/Makefile.in
@@ -8,3 +8,4 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/db2/hash/Makefile.in b/src/util/db2/hash/Makefile.in
index 6d6fdccdb0..e8cbe63bd7 100644
--- a/src/util/db2/hash/Makefile.in
+++ b/src/util/db2/hash/Makefile.in
@@ -10,3 +10,4 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/db2/mpool/Makefile.in b/src/util/db2/mpool/Makefile.in
index 03f221fc7d..6f487ee6d2 100644
--- a/src/util/db2/mpool/Makefile.in
+++ b/src/util/db2/mpool/Makefile.in
@@ -8,3 +8,4 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../db
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/db2/recno/Makefile.in b/src/util/db2/recno/Makefile.in
index 9639b4524c..6726227c67 100644
--- a/src/util/db2/recno/Makefile.in
+++ b/src/util/db2/recno/Makefile.in
@@ -10,3 +10,4 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
all-unix:: all-libobjs
clean-unix:: clean-libobjs
+# @libobj_frag@
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 90db964e2c..82b5583fa4 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-12-12 Tom Yu <tlyu@mit.edu>
* et_h.awk: It's "const struct error_table et_" in the c file, so
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index b7dd79cb1a..8212ce06dd 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -220,6 +220,10 @@ TAGS: et_name.c error_message.c compile_et.c error_table.c \
depend:: et_lex.lex.c
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 7dfe046c88..7a45fa9e41 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
+ K5_GEN_MAKEFILE and K5_AC_OUTPUT.
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-08 Ken Raeburn <raeburn@mit.edu>
* prof_file.c (make_hard_link): New function.
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index a735ed9d00..41d51f7ade 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -122,6 +122,10 @@ check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
$(RM) $(OUTPRE)*.obj
$(OUTPRE)test_parse test.ini
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
index acb6010fe2..8a275d3efd 100644
--- a/src/util/profile/configure.in
+++ b/src/util/profile/configure.in
@@ -10,8 +10,5 @@ AC_PROG_AWK
KRB5_BUILD_LIBOBJS
KRB5_BUILD_PROGRAM
KRB5_BUILD_LIBRARY_WITH_DEPS
-K5_GEN_MAKEFILE(., lib libobj)
K5_GEN_FILE(prtest)
-K5_AC_OUTPUT
-
-
+V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 0e37325eb8..8fb2d14d9b 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2002-12-06 Ezra Peisach <epeisach@bu.edu>
* configure.in: Quote the argument to AC_CHECK_HEADER. Autoconf
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 21632c274e..6abd7a5885 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -114,6 +114,10 @@ pty_err.c: pty_err.et
$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in
(cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h)
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 431b0863f4..97a6e9217b 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10 Ken Raeburn <raeburn@mit.edu>
+
+ * Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
+
2003-01-05 Sam Hartman <hartmans@mit.edu>
* pager.c: Remove declaration of errno
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index e83c256a56..713c6a964e 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -167,6 +167,10 @@ clean::
ss.ar ss.tar \
TAGS test_ss
+
+# @lib_frag@
+# @libobj_frag@
+
# +++ Dependency line eater +++
#
# Makefile dependencies follow. This must be the last section in