12 files changed, 42 insertions, 30 deletions
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 19ad80e..d984bee 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 27 16:38:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Wed Nov  6 12:02:20 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* kdestroy.c (main): Check the error return from
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index f52ed28..ccba1dd 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,14 +1,12 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-all::
-
-kdestroy: kdestroy.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(LIBS)
-
-kdestroy.o:	$(srcdir)/kdestroy.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: kdestroy
 
+kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ kdestroy.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) kdestroy.o kdestroy
diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index ec61f10..993b1be 100644
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(kdestroy.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index f3d8f2d..6b5bb22 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 27 16:44:20 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Dec  5 21:59:08 1996  Tom Yu  <tlyu@mit.edu>
 
 	* kinit.M: v5srvtab -> krb5.keytab [279]
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index d213016..7c88984 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,14 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-all::
-
-kinit: kinit.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(LIBS)
-
-kinit.o:	$(srcdir)/kinit.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: kinit
 
+kinit: kinit.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ kinit.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) kinit.o kinit
diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index 0b6b9df..8fb057c 100644
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/configure.in
@@ -2,6 +2,5 @@ AC_INIT(kinit.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(pwd.h)
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index f72ff09..8beb871 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 27 16:51:50 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Dec  5 21:59:34 1996  Tom Yu  <tlyu@mit.edu>
 
 	* klist.M: v5srvtab -> krb5.keytab [279]
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 3c98179..f024aa2 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,14 +1,13 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-all::
-
-klist: klist.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(LIBS)
-
-klist.o:	$(srcdir)/klist.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: klist
 
+klist: klist.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ klist.o $(KRB5_BASE_LIBS)
+
 clean::
 	$(RM) klist.o klist
 
diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index 7a0e584..f324b0a 100644
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(klist.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 0de61a4..85fbfb2 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 27 16:56:07 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Sun Nov 10 20:10:53 1996  Sam Hartman  <hartmans@mit.edu>
 
 	* krb_auth_su.c (path_passwd;): If you don't have a srvtab, always
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index 5b161c6..eeace51 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,6 +1,9 @@
 DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 SRCS = \
 	$(srcdir)/krb_auth_su.c \
 	$(srcdir)/ccache.c \
@@ -16,8 +19,8 @@ OBJS = \
 
 all:: ksu
 
-ksu: $(OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(LIBS)
+ksu: $(OBJS) $(KRB5_BASE_DEPLIBS) $(UTIL_DEPLIB)
+	$(CC_LINK) -o $@ $(OBJS) $(UTIL_LIB) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) ksu
diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in
index 9017d91..70d663b 100644
--- a/src/clients/ksu/configure.in
+++ b/src/clients/ksu/configure.in
@@ -5,7 +5,5 @@ USE_ANAME
 AC_HEADER_STDARG
 AC_CHECK_FUNCS(getusershell lstat )
 AC_CHECK_HEADERS(unistd.h)
-USE_KRB5UTIL_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE