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

7 files changed, 26 insertions, 4 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index d100b53..e0afb9d 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 758d198..51b030c 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 130cd2a..dc6e68a 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 f22b99b..6c065c6 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 513d7ae..7a22d9a 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 506b958..9be23de 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 2a2a7a3..a7782e7 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