* Makefile.in (LOCAL_LIBRARIES): put KRB4_LIB inside KLIB, and put

	KDB4_LIB ahead of them both.

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

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index 5932659e5f41016ec795269a11646a795e41e1b9..e0e289937f67dc777b25b93092c8d82bea4fb45f 100644 (file)
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 28 18:02:53 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (LOCAL_LIBRARIES): put KRB4_LIB inside KLIB, and put
+       KDB4_LIB ahead of them both.
+
 Thu Apr 27 13:45:46 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (LOCAL_LIBRARIES): use KDB4_LIB and KRB4_LIB directly.

diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index d94aaa524e655d021a523172b664c1d6bcab6ff2..78f8200b9526061032078b0ee956086dbc202108 100644 (file)
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -11,12 +11,12 @@ DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
 
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4_LIB) $(KRB4_LIB)
+LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB) 
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 all:: kdb5_convert

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index cc871faf3b7612e2af4e1ffe4639eeb868d5f3e8..f343b5e7412385033db4f28ff4a55a542ce916d7 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 28 18:04:26 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (LOCAL_LIBRARIES): put KRB4_LIB inside KLIB, and put
+       KDB4_LIB ahead of them both.
+
 Thu Apr 27 13:47:23 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (LOCAL_LIBRARIES): use KRB4_LIB and KDB4_LIB

diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index ac7a82e6f2a743faebab87104fd33af36c8367ee..a8859cc145be5189a8a853dc06aaf2583b37db6c 100644 (file)
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -11,12 +11,12 @@ DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
 
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
-LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4_LIB) $(KRB4_LIB)
+LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 
 OBJS= kdb5_edit.o \