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

@@ -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)

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 \

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

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)

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

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

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

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@ \

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)

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)