summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1995-04-28 22:05:14 +0000
committerMark Eichin <eichin@mit.edu>1995-04-28 22:05:14 +0000
commit5cd133ad14c5d57eca09c8e22bf698f14be29b4e (patch)
treed714a89913b1a465724c1d124a5b196dec8c02ac
parente4d656b080c11a580f0eac7025595e4c3af5d10a (diff)
downloadkrb5-5cd133ad14c5d57eca09c8e22bf698f14be29b4e.tar.gz
krb5-5cd133ad14c5d57eca09c8e22bf698f14be29b4e.tar.xz
krb5-5cd133ad14c5d57eca09c8e22bf698f14be29b4e.zip
* 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
-rw-r--r--src/admin/convert/ChangeLog5
-rw-r--r--src/admin/convert/Makefile.in4
-rw-r--r--src/admin/edit/ChangeLog5
-rw-r--r--src/admin/edit/Makefile.in4
4 files changed, 14 insertions, 4 deletions
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index 5932659e5..e0e289937 100644
--- 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 d94aaa524..78f8200b9 100644
--- 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 cc871faf3..f343b5e74 100644
--- 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 ac7a82e6f..a8859cc14 100644
--- 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 \