From 921cc2cf63ec5384bb70a9581d069a3a2a9ec83e Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 28 May 1998 18:04:01 +0000 Subject: [PATCH] move libdes after krb4 libs to avoid multiple definitions with shared libs git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4965 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/Makefile.am | 2 +- appl/ftp/ftpd/Makefile.am | 2 +- appl/login/Makefile.am | 2 +- appl/popper/Makefile.am | 2 +- appl/push/Makefile.am | 2 +- appl/rsh/Makefile.am | 2 +- appl/telnet/telnet/Makefile.am | 2 +- appl/telnet/telnetd/Makefile.am | 2 +- appl/xnlock/Makefile.am | 4 ++-- kdc/Makefile.am | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am index 628f6ff7a..ae16b01ce 100644 --- a/appl/ftp/ftp/Makefile.am +++ b/appl/ftp/ftp/Makefile.am @@ -32,8 +32,8 @@ LDADD = \ ../common/libcommon.a \ $(top_builddir)/lib/gssapi/libgssapi.la \ $(top_builddir)/lib/krb5/libkrb5.la \ + $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_krb4) \ $(top_builddir)/lib/roken/libroken.la \ $(LIB_readline) diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am index 2e881fea7..19b3f24af 100644 --- a/appl/ftp/ftpd/Makefile.am +++ b/appl/ftp/ftpd/Makefile.am @@ -49,8 +49,8 @@ LDADD = ../common/libcommon.a \ $(top_builddir)/lib/gssapi/libgssapi.la \ $(afslib) \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/otp/libotp.la \ $(top_builddir)/lib/roken/libroken.la \ diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am index ee2d6e087..d85f78ae3 100644 --- a/appl/login/Makefile.am +++ b/appl/login/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = login login_SOURCES = login.c read_string.c utmp_login.c utmpx_login.c tty.c stty_default.c LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am index 9848d8917..4d10a3f23 100644 --- a/appl/popper/Makefile.am +++ b/appl/popper/Makefile.am @@ -21,8 +21,8 @@ popper_SOURCES = \ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_otp) \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la \ $(DBLIB) diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am index dd8620b71..f21cfdcc4 100644 --- a/appl/push/Makefile.am +++ b/appl/push/Makefile.am @@ -9,7 +9,7 @@ libexec_PROGRAMS = push push_SOURCES = push.c LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am index 87f4a8cb3..b127cb108 100644 --- a/appl/rsh/Makefile.am +++ b/appl/rsh/Makefile.am @@ -13,7 +13,7 @@ rsh_SOURCES = rsh.c common.c rshd_SOURCES = rshd.c common.c LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am index f10f41189..d2b08d559 100644 --- a/appl/telnet/telnet/Makefile.am +++ b/appl/telnet/telnet/Makefile.am @@ -12,8 +12,8 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c \ LDADD = ../libtelnet/libtelnet.a \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ @LIB_tgetent@ \ $(top_builddir)/lib/roken/libroken.la diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am index 4f17621bd..b45b2bb63 100644 --- a/appl/telnet/telnetd/Makefile.am +++ b/appl/telnet/telnetd/Makefile.am @@ -12,8 +12,8 @@ telnetd_SOURCES = telnetd.c state.c termstat.c slc.c sys_term.c \ LDADD = \ ../libtelnet/libtelnet.a \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ + $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ @LIB_tgetent@ \ @LIB_logwtmp@ \ diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index e948ff71d..75c527e8b 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -16,9 +16,9 @@ endif LDADD = \ $(top_builddir)/lib/kafs/libkafs.a \ - $(LIB_krb4) \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/asn1/libasn1.la \ + $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ + $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/roken/libroken.la \ $(XLIBS) diff --git a/kdc/Makefile.am b/kdc/Makefile.am index 881e4219e..e38512479 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -21,9 +21,9 @@ if KRB4 hprop_LDADD = \ $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ + $(LIB_krb4) -lkdb $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_krb4) -lkdb $(LIB_krb4) \ $(top_builddir)/lib/roken/libroken.la \ $(DBLIB) else @@ -32,9 +32,9 @@ endif LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/krb5/libkrb5.la \ + $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_krb4) \ $(top_builddir)/lib/roken/libroken.la \ $(DBLIB)