* Makefile.in (KLIB): put KRB4_LIB inside KLIB

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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 9b42a413460201acb0ecc8546a995626fce5a718..6ca8bcddd9f2670b3e8424ac760359fd9d1b95bc 100644 (file)
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 18:07:03 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (KLIB): put KRB4_LIB inside KLIB.
+
 Thu Apr 27 13:56:12 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (telnet): use KRB4_LIB directly.

diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 951da68cac72c551edcb3907005b0f5243768b56..05039d277edb10595125d96a74089d280bee4288 100644 (file)
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -27,7 +27,7 @@ CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=  commands.c main.c network.c ring.c \
@@ -43,7 +43,7 @@ OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 all:: telnet
 
 telnet:        $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(KRB4_LIB) $(LIBS)
+       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 clean::
        $(RM) telnet

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 72640848178cbbe6bd4291cf956622d2ef4f8e77..c57e366c7aa69f5b812db28bb73ef644ea657b23 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 18:07:34 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (KLIB): put KRB4_LIB inside KLIB.
+
 Thu Apr 27 13:57:03 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (telnetd): use KRB4_LIB directly.

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 347765b51f05f82566bddfe36435fc744198f6a7..f78338530bcfb74f9c7ae58aa207a74f612bfff7 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -27,7 +27,7 @@ CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=  $(srcdir)/telnetd.c \
@@ -52,7 +52,7 @@ OBJS= telnetd.o \
 all:: telnetd
 
 telnetd: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(KRB4_LIB) $(LIBS)
+       $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 clean::
        $(RM) telnetd

diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog
index 267312bd8d50674c0f26f9104dbb9d274b47531f..c57b30e1f29c42f5e7e939f2bf11bc01ff69e237 100644 (file)
--- a/src/kadmin.v4/server/ChangeLog
+++ b/src/kadmin.v4/server/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 18:08:05 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (KLIB): put KRB4_LIB inside KLIB.
+
 Thu Apr 27 13:53:41 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (v4kadmind): use KRB4_LIB directly.

diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in
index 0d04bb8bd892b33f0e8ae326ddb8a72bf974e474..b9d8b0f05ff69ae9920ee2259b3ce9af38cede72 100644 (file)
--- a/src/kadmin.v4/server/Makefile.in
+++ b/src/kadmin.v4/server/Makefile.in
@@ -7,7 +7,7 @@ DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
-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)
@@ -42,7 +42,7 @@ kadm_err.c: kadm_err.et
 kadm_err.h: kadm_err.et
 
 v4kadmind: $(OBJS) $(DEPLIBS)
-       $(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KRB4_LIB) $(KLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 5e7e131bb13b035ae6203afcb23a7e565ce3eedd..074672fb8f0d04816fd46e1fbace39d76f4430c4 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 28 18:05:52 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (KLIB): put KRB4_LIB inside KLIB.
+
 Thu Apr 27 13:52:22 1995  Mark Eichin  <eichin@cygnus.com>
 
        * Makefile.in (krb5kdc): use KRB4_LIB directly.

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 5273db92baf3af7ab48f7b103911224ec55ae07a..a179a999a6d18a6448d4f66c1df19594e6678068 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -7,7 +7,7 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
 KDBLIB=$(TOPLIBD)/libkdb5.a 
 
-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)
 
 KRB4INCLUDES=-I$(SRCTOP)/include/kerberosIV
@@ -54,7 +54,7 @@ kdc5_err.h: kdc5_err.et
 kdc5_err.o: kdc5_err.h
 
 krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB)
-       $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KRB4_LIB) $(KLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc