diff --git a/admin/Makefile.am b/admin/Makefile.am index 10d052afb..fe937fc88 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -22,7 +22,7 @@ ktutil_SOURCES = add.c \ LDADD = \ $(top_builddir)/lib/kadm5/libkadm5clnt.la \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_readline) \ diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am index a1d5ffef7..3d8e6d2bb 100644 --- a/appl/afsutil/Makefile.am +++ b/appl/afsutil/Makefile.am @@ -17,5 +17,5 @@ LDADD = $(LIB_kafs) \ $(LIB_krb4) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am index d4d396e59..6a4de1a80 100644 --- a/appl/ftp/ftp/Makefile.am +++ b/appl/ftp/ftp/Makefile.am @@ -41,6 +41,6 @@ LDADD = \ $(LIB_gssapi) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(LIB_readline) diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am index 45bf06858..4bbb0bcaf 100644 --- a/appl/ftp/ftpd/Makefile.am +++ b/appl/ftp/ftpd/Makefile.am @@ -51,6 +51,6 @@ LDADD = ../common/libcommon.a \ $(LIB_krb5) \ $(LIB_krb4) \ $(LIB_otp) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB) diff --git a/appl/kf/Makefile.am b/appl/kf/Makefile.am index 731b7d54e..e4524a02d 100644 --- a/appl/kf/Makefile.am +++ b/appl/kf/Makefile.am @@ -13,6 +13,6 @@ kf_SOURCES = kf.c kf_locl.h kfd_SOURCES = kfd.c kf_locl.h LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am index 983134f23..056417c61 100644 --- a/appl/kx/Makefile.am +++ b/appl/kx/Makefile.am @@ -68,6 +68,6 @@ LDADD = \ $(LIB_kafs) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(X_LIBS) $(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS) diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am index 3e8912870..2debe3f3d 100644 --- a/appl/login/Makefile.am +++ b/appl/login/Makefile.am @@ -25,7 +25,7 @@ LDADD = $(LIB_otp) \ $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(LIB_security) \ diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am index fb7701e57..7d65962f8 100644 --- a/appl/otp/Makefile.am +++ b/appl/otp/Makefile.am @@ -11,6 +11,6 @@ man_MANS = otp.1 otpprint.1 LDADD = \ $(top_builddir)/lib/otp/libotp.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB) diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am index 6a282f5a1..dacdd5149 100644 --- a/appl/popper/Makefile.am +++ b/appl/popper/Makefile.am @@ -24,6 +24,6 @@ LDADD = \ $(LIB_otp) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB) diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am index bf7b19c2d..7fd26be55 100644 --- a/appl/push/Makefile.am +++ b/appl/push/Makefile.am @@ -22,6 +22,6 @@ EXTRA_DIST = pfrom.in $(man_MANS) LDADD = $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(LIB_hesiod) diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am index fc7b8d81c..cbea5bede 100644 --- a/appl/rsh/Makefile.am +++ b/appl/rsh/Makefile.am @@ -14,7 +14,6 @@ rshd_SOURCES = rshd.c common.c rsh_locl.h LDADD = $(LIB_kafs) \ $(LIB_krb5) \ - $(top_builddir)/lib/des/libdes.la \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) diff --git a/appl/su/Makefile.am b/appl/su/Makefile.am index 8a56f594e..30db06d10 100644 --- a/appl/su/Makefile.am +++ b/appl/su/Makefile.am @@ -11,6 +11,6 @@ su_SOURCES = su.c LDADD = $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am index b484addcf..20c4181db 100644 --- a/appl/telnet/telnet/Makefile.am +++ b/appl/telnet/telnet/Makefile.am @@ -17,6 +17,6 @@ man_MANS = telnet.1 LDADD = ../libtelnet/libtelnet.a \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_tgetent) \ $(LIB_roken) diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am index 84bc1a2b2..513f6f410 100644 --- a/appl/telnet/telnetd/Makefile.am +++ b/appl/telnet/telnetd/Makefile.am @@ -17,7 +17,7 @@ LDADD = \ ../libtelnet/libtelnet.a \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_tgetent) \ $(LIB_logwtmp) \ $(LIB_roken) diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am index 5d1822e12..49365b81d 100644 --- a/appl/test/Makefile.am +++ b/appl/test/Makefile.am @@ -32,6 +32,6 @@ nt_gss_client_LDADD = $(gssapi_server_LDADD) nt_gss_server_LDADD = $(nt_gss_client_LDADD) LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index 72ecd3dd6..a36bb6631 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -25,6 +25,6 @@ LDADD = \ $(LIB_kafs) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am index 7d85f6f42..c3f42dc45 100644 --- a/kadmin/Makefile.am +++ b/kadmin/Makefile.am @@ -49,7 +49,7 @@ COMMON_LDADD = \ $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) diff --git a/kdc/Makefile.am b/kdc/Makefile.am index 8d38352dc..ef6fb01f7 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -39,7 +39,7 @@ hprop_LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_kdb) $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) @@ -49,7 +49,7 @@ hpropd_LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_kdb) $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) @@ -58,7 +58,7 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am index ea443ca0d..cc5619fed 100644 --- a/kpasswd/Makefile.am +++ b/kpasswd/Makefile.am @@ -24,6 +24,6 @@ kpasswdd_LDADD = \ $(DBLIB) LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/kuser/Makefile.am b/kuser/Makefile.am index 738c4c7a8..e700bcc40 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -20,7 +20,7 @@ kauth_LDADD = \ $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) @@ -32,6 +32,6 @@ klist_LDADD = $(kauth_LDADD) LDADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index 1e56b48a5..6163a96ad 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -16,7 +16,7 @@ LDADD = libhdb.la \ $(LIB_openldap) \ ../krb5/libkrb5.la \ ../asn1/libasn1.la \ - ../des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB) diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index 6563789e2..d17a532c9 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -100,7 +100,7 @@ LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB) \ $(LIB_dlopen) diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index eb63a76cd..1606931e0 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.am.common noinst_PROGRAMS = otptest otptest_LDADD = libotp.la \ - $(top_builddir)/lib/des/libdes.la \ + $(LIB_des) \ $(LIB_roken) \ $(DBLIB)