From e53706c80a4ec0484ac488c5c119d9eb2b341111 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Fri, 9 Apr 1999 18:29:48 +0000 Subject: [PATCH] use LIB_roken git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5897 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/Makefile.am | 2 +- appl/afsutil/Makefile.am | 2 +- appl/ftp/ftp/Makefile.am | 2 +- appl/ftp/ftpd/Makefile.am | 4 ++-- appl/kx/Makefile.am | 2 +- appl/login/Makefile.am | 2 +- appl/otp/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/test/Makefile.am | 2 +- appl/xnlock/Makefile.am | 2 +- kadmin/Makefile.am | 2 +- kdc/Makefile.am | 4 ++-- kpasswd/Makefile.am | 2 +- kuser/Makefile.am | 4 ++-- lib/asn1/Makefile.am | 8 ++++++-- lib/com_err/Makefile.am | 4 +++- lib/editline/Makefile.am | 6 ++++-- lib/hdb/Makefile.am | 2 +- lib/kadm5/Makefile.am | 2 +- lib/otp/Makefile.am | 2 +- lib/sl/Makefile.am | 4 +++- 25 files changed, 40 insertions(+), 30 deletions(-) diff --git a/admin/Makefile.am b/admin/Makefile.am index 3ee2dfe34..af273d3c3 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -17,4 +17,4 @@ LDADD = \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_readline) \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am index 1f90abd13..94d7b0a72 100644 --- a/appl/afsutil/Makefile.am +++ b/appl/afsutil/Makefile.am @@ -14,4 +14,4 @@ LDADD = $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am index 1281bde17..962ced1de 100644 --- a/appl/ftp/ftp/Makefile.am +++ b/appl/ftp/ftp/Makefile.am @@ -40,5 +40,5 @@ LDADD = \ $(LIB_krb5) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(LIB_readline) diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am index 60f09aed3..42cacf14b 100644 --- a/appl/ftp/ftpd/Makefile.am +++ b/appl/ftp/ftpd/Makefile.am @@ -49,5 +49,5 @@ LDADD = ../common/libcommon.a \ $(LIB_krb4) \ $(top_builddir)/lib/otp/libotp.la \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ - @LIB_crypt@ $(DBLIB) + $(LIB_roken) \ + $(DBLIB) diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am index 831b95604..0875fbd4d 100644 --- a/appl/kx/Makefile.am +++ b/appl/kx/Makefile.am @@ -58,5 +58,5 @@ LDADD = \ $(LIB_kafs) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS) diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am index fcbdf9b27..196f3a83d 100644 --- a/appl/login/Makefile.am +++ b/appl/login/Makefile.am @@ -13,5 +13,5 @@ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(LIB_security) diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am index 47346c02c..fa9789ef7 100644 --- a/appl/otp/Makefile.am +++ b/appl/otp/Makefile.am @@ -10,5 +10,5 @@ otpprint_SOURCES = otpprint.c otp_locl.h LDADD = \ $(top_builddir)/lib/otp/libotp.la \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am index f8727e201..6a282f5a1 100644 --- a/appl/popper/Makefile.am +++ b/appl/popper/Makefile.am @@ -25,5 +25,5 @@ LDADD = \ $(LIB_krb5) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am index ba40d4d03..ea76f3d93 100644 --- a/appl/push/Makefile.am +++ b/appl/push/Makefile.am @@ -23,5 +23,5 @@ EXTRA_DIST = pfrom.in $(man_MANS) LDADD = $(LIB_krb5) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(LIB_hesiod) diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am index afef31e97..b84425094 100644 --- a/appl/rsh/Makefile.am +++ b/appl/rsh/Makefile.am @@ -16,4 +16,4 @@ LDADD = $(LIB_kafs) \ $(LIB_krb5) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am index bbedbd709..1d1cb2dbd 100644 --- a/appl/telnet/telnet/Makefile.am +++ b/appl/telnet/telnet/Makefile.am @@ -17,4 +17,4 @@ LDADD = ../libtelnet/libtelnet.a \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(LIB_tgetent) \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am index 8fedb7ca5..74703f056 100644 --- a/appl/telnet/telnetd/Makefile.am +++ b/appl/telnet/telnetd/Makefile.am @@ -18,4 +18,4 @@ LDADD = \ $(top_builddir)/lib/des/libdes.la \ $(LIB_tgetent) \ $(LIB_logwtmp) \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am index 12fbe52b4..b2367358b 100644 --- a/appl/test/Makefile.am +++ b/appl/test/Makefile.am @@ -26,4 +26,4 @@ gssapi_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index 60dcbc490..f3b71ceab 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -19,5 +19,5 @@ LDADD = \ $(LIB_krb5) \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am index f5779eb10..a033db9dd 100644 --- a/kadmin/Makefile.am +++ b/kadmin/Makefile.am @@ -21,7 +21,7 @@ COMMON_LDADD = \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_readline) \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la $(COMMON_LDADD) diff --git a/kdc/Makefile.am b/kdc/Makefile.am index 3bbd53275..35aa63ba1 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -40,7 +40,7 @@ hprop_LDADD = \ $(LIB_kdb) $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) LDADD = $(top_builddir)/lib/hdb/libhdb.la \ @@ -48,6 +48,6 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am index 81ab10e00..35afd7519 100644 --- a/kpasswd/Makefile.am +++ b/kpasswd/Makefile.am @@ -21,4 +21,4 @@ kpasswdd_LDADD = \ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/kuser/Makefile.am b/kuser/Makefile.am index aaad02153..b4f3050c0 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -22,7 +22,7 @@ kauth_LDADD = \ $(LIB_krb4) \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) kinit_LDADD = $(kauth_LDADD) @@ -34,4 +34,4 @@ LDADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/des/libdes.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(top_builddir)/lib/roken/libroken.la + $(LIB_roken) diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am index 369a5e5c1..85468f07c 100644 --- a/lib/asn1/Makefile.am +++ b/lib/asn1/Makefile.am @@ -75,9 +75,13 @@ libasn1_la_SOURCES = \ timegm.c \ $(BUILT_SOURCES) -asn1_compile_LDADD = ../roken/libroken.la $(LEXLIB) +asn1_compile_LDADD = \ + $(LIB_roken) $(LEXLIB) -check_der_LDADD = libasn1.la ../com_err/libcom_err.la ../roken/libroken.la +check_der_LDADD = \ + libasn1.la \ + ../com_err/libcom_err.la \ + $(LIB_roken) TESTS = check-der diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am index bbaa5fe99..f59f96938 100644 --- a/lib/com_err/Makefile.am +++ b/lib/com_err/Makefile.am @@ -19,4 +19,6 @@ CLEANFILES = lex.c parse.c parse.h $(compile_et_OBJECTS): parse.h -compile_et_LDADD = ../roken/libroken.la $(LEXLIB) +compile_et_LDADD = \ + $(LIB_roken) \ + $(LEXLIB) diff --git a/lib/editline/Makefile.am b/lib/editline/Makefile.am index 66788156c..6579da94b 100644 --- a/lib/editline/Makefile.am +++ b/lib/editline/Makefile.am @@ -12,8 +12,10 @@ noinst_LIBRARIES = endif noinst_PROGRAMS = testit -testit_LDADD = libeditline.a $(LIB_tgetent) \ - $(top_builddir)/lib/roken/libroken.la +testit_LDADD = \ + libeditline.a \ + $(LIB_tgetent) \ + $(LIB_roken) include_HEADERS = editline.h diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index 6af568b35..23120067a 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -16,7 +16,7 @@ LDADD = libhdb.la \ ../krb5/libkrb5.la \ ../asn1/libasn1.la \ ../des/libdes.la \ - ../roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) lib_LTLIBRARIES = libhdb.la diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index 6abf545c2..d6dc53158 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -95,7 +95,7 @@ LDADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) CLEANFILES = kadm5_err.c kadm5_err.h diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index beac72766..479045342 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = otptest otptest_LDADD = libotp.la \ $(top_builddir)/lib/des/libdes.la \ - $(top_builddir)/lib/roken/libroken.la \ + $(LIB_roken) \ $(DBLIB) include_HEADERS = otp.h diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am index a61f0f2b1..d6a2e71fc 100644 --- a/lib/sl/Makefile.am +++ b/lib/sl/Makefile.am @@ -34,7 +34,9 @@ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c $(mk_cmds_OBJECTS): parse.h -LDADD = ../roken/libroken.la $(LEXLIB) +LDADD = \ + $(LIB_roken) \ + $(LEXLIB) strtok_r.c: $(LN_S) $(srcdir)/../roken/strtok_r.c .