summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/appl/telnet/telnet/ChangeLog4
-rw-r--r--src/appl/telnet/telnet/Makefile.in4
-rw-r--r--src/appl/telnet/telnetd/ChangeLog4
-rw-r--r--src/appl/telnet/telnetd/Makefile.in4
-rw-r--r--src/kadmin.v4/server/ChangeLog4
-rw-r--r--src/kadmin.v4/server/Makefile.in4
-rw-r--r--src/kdc/ChangeLog4
-rw-r--r--src/kdc/Makefile.in4
8 files changed, 24 insertions, 8 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 9b42a4134..6ca8bcddd 100644
--- 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 951da68ca..05039d277 100644
--- 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 726408481..c57e366c7 100644
--- 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 347765b51..f78338530 100644
--- 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 267312bd8..c57b30e1f 100644
--- 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 0d04bb8bd..b9d8b0f05 100644
--- 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 5e7e131bb..074672fb8 100644
--- 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 5273db92b..a179a999a 100644
--- 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