* Makefile.in (LOCAL_LIBRARIES): use KDB4_LIB and KRB4_LIB directly

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

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index d9ab869a7e0322201a251d789b049d97d8edb951..5932659e5f41016ec795269a11646a795e41e1b9 100644 (file)
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 27 13:45:46 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (LOCAL_LIBRARIES): use KDB4_LIB and KRB4_LIB directly.
+
 Tue Mar 28 16:41:52 1995    <tytso@rsx-11.mit.edu>
 
        * kdb5_convert.c (fixup_database, main): Set SUPPORT_DESMD5

diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 9b33957a2adf5a5149ac5719096796ba9b7625f3..d94aaa524e655d021a523172b664c1d6bcab6ff2 100644 (file)
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -1,4 +1,5 @@
-KRB4 = @KRB4@
+KRB4_LIB = @KRB4_LIB@
+KDB4_LIB = @KDB4_LIB@
 
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
@@ -8,9 +9,6 @@ DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
-KDB4LIB=$(KRB4)/lib/libkdb.a
-KRB4LIB=$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a
-
 all::
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
@@ -18,7 +16,7 @@ DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
 
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4LIB) $(KRB4LIB)
+LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4_LIB) $(KRB4_LIB)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 all:: kdb5_convert