summaryrefslogtreecommitdiffstats
path: root/src/admin
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1995-04-27 19:21:36 +0000
committerMark Eichin <eichin@mit.edu>1995-04-27 19:21:36 +0000
commit4c292882faa020a7cf01c2469f8ee32ef2e98307 (patch)
treefba654019e6b45fb04c016988a92f359223e0243 /src/admin
parent907d061669d84cadbcb5df6d6554310ca6a5c0d1 (diff)
downloadkrb5-4c292882faa020a7cf01c2469f8ee32ef2e98307.tar.gz
krb5-4c292882faa020a7cf01c2469f8ee32ef2e98307.tar.xz
krb5-4c292882faa020a7cf01c2469f8ee32ef2e98307.zip
* 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
Diffstat (limited to 'src/admin')
-rw-r--r--src/admin/convert/ChangeLog4
-rw-r--r--src/admin/convert/Makefile.in8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index d9ab869a7..5932659e5 100644
--- 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 9b33957a2..d94aaa524 100644
--- 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