Reorganize library logic and use LDFLAGS from configure

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6250 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 33 insertions, 31 deletions

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 5d2782264..76be2b4c2 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:52:51 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling and LDFLAGS..
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:45:03 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index f911d4703..bf13ee7e3 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-kdestroy: kdestroy.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(KLIB) $(LIBS)
+kdestroy: kdestroy.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(LIBS)
 
 kdestroy.o:	$(srcdir)/kdestroy.c
 
diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in
index 865124d3b..ec61f106a 100644
--- a/src/clients/kdestroy/configure.in
+++ b/src/clients/kdestroy/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(kdestroy.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index f8ca6cbae..6e39921bd 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:53:29 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling.
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 Thu Jun 15 17:45:47 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Change explicit library names to -l<lib> form, and
 		change target link line to use $(LD) and associated flags.
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index e1b9737c1..402b67283 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,14 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-kinit: kinit.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(KLIB) $(LIBS)
+kinit: kinit.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(LIBS)
 
 kinit.o:	$(srcdir)/kinit.c
 
diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in
index e4e397770..0b6b9df56 100644
--- a/src/clients/kinit/configure.in
+++ b/src/clients/kinit/configure.in
@@ -2,5 +2,6 @@ AC_INIT(kinit.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(pwd.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index cd7259606..44aa34019 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:54:35 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
 Wed Jun 21 10:37:01 1995    <tytso@rsx-11.mit.edu>
 
 	* klist.c: Change PROTOTYPE -> KRB5_PROTOTYPE
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 15d003326..61e32659f 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-klist: klist.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(KLIB) $(LIBS)
+klist: klist.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(LIBS)
 
 klist.o:	$(srcdir)/klist.c
 
diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in
index 1022a8f90..7a0e584d6 100644
--- a/src/clients/klist/configure.in
+++ b/src/clients/klist/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(klist.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 2388f1f60..361e0c289 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:55:14 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling and LDFLAGS.
+	* configure.in - Add USE_KADM_LIBRARY and KRB5_LIBRARIES.
+
 Thu Jul  6 17:30:49 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
 	* krb_auth_su.c (krb5_get_tkt_via_passwd): Pass context to
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index 7a878ce64..43a312565 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,8 +1,5 @@
 DEFINES = -DLOCAL_REALM='"."' -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 SRCS = \
 	$(srcdir)/krb_auth_su.c \
@@ -19,11 +16,8 @@ OBJS = \
 
 all:: ksu
 
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-ksu: $(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(KLIB) $(LIBS)
+ksu: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(LIBS)
 
 clean::
 	$(RM) ksu
diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in
index ff03dcd4e..62847f557 100644
--- a/src/clients/ksu/configure.in
+++ b/src/clients/ksu/configure.in
@@ -5,5 +5,7 @@ AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_CHECK_HEADERS(stdarg.h)
 AC_CHECK_FUNCS(getusershell)
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE