diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2002-05-11 00:20:22 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2002-05-11 00:20:22 +0000 |
| commit | 8af263c86ca9069f7b81553ac8eeb857e092bf7b (patch) | |
| tree | 4c3c0abc671f01208e923407224282de7a99c7f9 | |
| parent | c5d734d9312af8955fd681c243c46501f2e88049 (diff) | |
Add missing libraries to bsd.prog.mk (mostly kerberosV)
Use them in DPADD throughout the tree.
Fix a few mispells (LIBMATH -> LIBM...)
Wipe obsolete lib (LIBRESOLV)
Sort added missing libraries, move obsolete stuff apart.
Synch documentation in bsd.README
ok deraadt@
80 files changed, 247 insertions, 137 deletions
diff --git a/games/factor/Makefile b/games/factor/Makefile index e5b7697eee5..0dedb3f7d9d 100644 --- a/games/factor/Makefile +++ b/games/factor/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2001/08/19 23:19:46 pjanzen Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:18 espie Exp $ PROG= factor SRCS= factor.c pattern.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes MAN= factor.6 MLINKS+=factor.6 primes.6 -DPADD= ${LIBMATH} +DPADD= ${LIBM} LDADD= -lm .PATH: ${.CURDIR}/../primes diff --git a/games/hack/Makefile b/games/hack/Makefile index 875dd978801..a1fccdbab3d 100644 --- a/games/hack/Makefile +++ b/games/hack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 1998/07/24 00:10:29 millert Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/11 00:20:18 espie Exp $ PROG= hack CFLAGS+=-I. @@ -15,7 +15,7 @@ SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \ hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c MAN= hack.6 -DPADD+= ${LIBCURSES} ${LIBCOMPAT} +DPADD+= ${LIBCURSES} LDADD+= -lcurses HIDEGAME=hidegame CLEANFILES+=hack.onames.h makedefs diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper index fd84aea00fb..41d3df35942 100644 --- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper +++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2001/11/22 20:37:18 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2002/05/11 00:20:18 espie Exp $ .if (${MACHINE_ARCH} == "mips") NOPIC= @@ -29,6 +29,7 @@ LIBIBERTY_OBJDIR!=if [ -d $(LIBIBERTY_DIR)/$(OBJDIR) ]; then \ LIB= stdc++ CXXFLAGS+= -fno-implicit-templates CPPFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/stl -I$(.CURDIR)/../libio -I$(IO_OBJDIR) +DPADD+= ${LIBM} LDADD+= -lm # stdc++ sources/objs diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile index 5e9cb210181..9d527e67b41 100644 --- a/gnu/usr.bin/ld/rtld/Makefile +++ b/gnu/usr.bin/ld/rtld/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/09/06 19:09:29 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:18 espie Exp $ # $NetBSD: Makefile,v 1.11 1995/10/09 00:11:24 pk Exp $ PROG= ld.so @@ -12,6 +12,7 @@ PICFLAG=-fpic -fno-function-cse CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE_ARCH) $(PICFLAG) -DRTLD -DLIBC_SCCS LDFLAGS+=-nostartfiles -nostdlib -Wl,-Bshareable,-Bsymbolic,-assert,nosymbolic ASFLAGS+=-k +DPADD+= ${LIBC} LDADD+= -lc_pic BINDIR= /usr/libexec diff --git a/kerberosIV/lib/krb/Makefile b/kerberosIV/lib/krb/Makefile index 81368db27c4..249e75dde9d 100644 --- a/kerberosIV/lib/krb/Makefile +++ b/kerberosIV/lib/krb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/05/14 14:13:36 hin Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:18 espie Exp $ LIB = krb @@ -126,5 +126,6 @@ MLINKS+=krb_sendauth.3 krb_recvauth.3 krb_sendauth.3 krb_net_write.3 \ MLINKS+=tf_util.3 tf_init.3 tf_util.3 tf_get_pname.3 tf_util.3 tf_get_pinst.3 \ tf_util.3 tf_get_cred.3 tf_util.3 tf_close.3 +DPADD+= ${LIBCOM_ERR} LDADD+= ${COM_ERR} .include <bsd.lib.mk> diff --git a/kerberosIV/libexec/kadmind/Makefile b/kerberosIV/libexec/kadmind/Makefile index f572df2b83c..d3ee08bf4b0 100644 --- a/kerberosIV/libexec/kadmind/Makefile +++ b/kerberosIV/libexec/kadmind/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:18 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:18 espie Exp $ PROG = kadmind @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kadmin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl +DPADD += ${LIBACL} ${LIBKDB} ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} LDADD += ${LIBROKEN} -lacl -lkdb -lkadm -lkrb -ldes -lcom_err SRCS = kadm_server.c kadm_funcs.c admin_server.c kadm_ser_wrap.c pw_check.c diff --git a/kerberosIV/libexec/kauthd/Makefile b/kerberosIV/libexec/kauthd/Makefile index 0e2709b47ec..08fb33a5661 100644 --- a/kerberosIV/libexec/kauthd/Makefile +++ b/kerberosIV/libexec/kauthd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/02/16 19:27:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/11 00:20:18 espie Exp $ PROG = kauthd @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/appl/kauth CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl +DPADD += ${LIBKAFS} ${LIBKRB} ${LIBKDB} ${LIBKADM} ${LIBKRB5} ${LIBASN1} \ + ${LIBDES} ${LIBCRYPTO} LDADD += -lkafs -lkrb -lkdb -lkadm -lkrb5 -lasn1 -ldes -lcrypto ${LIBROKEN} SRCS = kauthd.c marshall.c encdata.c diff --git a/kerberosIV/libexec/kerberos/Makefile b/kerberosIV/libexec/kerberos/Makefile index 102de74b7b4..ec9c940017d 100644 --- a/kerberosIV/libexec/kerberos/Makefile +++ b/kerberosIV/libexec/kerberos/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/07/28 01:25:02 hugh Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/11 00:20:18 espie Exp $ PROG = kerberos @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/server CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBKADM} ${LIBDES} \ + ${LIBASN1} ${LIBCOM_ERR} ${LIBACL} ${LIBCRYPTO} LDADD += -lkafs -lkrb5 -lkdb -lkrb -lkadm -ldes -lasn1 -lcom_err \ -lacl -lcrypto ${LIBROKEN} diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile index 01bf47aca9d..97bb458eef3 100644 --- a/kerberosIV/libexec/kpropd/Makefile +++ b/kerberosIV/libexec/kpropd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:19 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:18 espie Exp $ PROG = kpropd @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/slave CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/kdb +DPADD += ${LIBKADM} ${LIBKDB} ${LIBKRB} ${LIBDES} LDADD += ${LIBROKEN} -lkadm -lkdb -lkrb -ldes SRCS = kpropd.c diff --git a/kerberosIV/usr.bin/afslog/Makefile b/kerberosIV/usr.bin/afslog/Makefile index 3784c4b5f2e..7ac7a08c742 100644 --- a/kerberosIV/usr.bin/afslog/Makefile +++ b/kerberosIV/usr.bin/afslog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:13 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:18 espie Exp $ PROG = afslog @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/appl/afsutil CFLAGS += -I. +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} ${LIBASN1} LDADD += -lkafs -lkrb5 -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = aklog.c diff --git a/kerberosIV/usr.bin/kauth/Makefile b/kerberosIV/usr.bin/kauth/Makefile index 149a5ada2c5..dab34bd4fbd 100644 --- a/kerberosIV/usr.bin/kauth/Makefile +++ b/kerberosIV/usr.bin/kauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/01/09 02:41:19 angelos Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:18 espie Exp $ PROG = kauth @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/appl/kauth CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes SRCS = kauth.c rkinit.c encdata.c marshall.c diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile index c9dbc1cde8b..2b2e2d7e655 100644 --- a/kerberosIV/usr.bin/kdestroy/Makefile +++ b/kerberosIV/usr.bin/kdestroy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:20 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:18 espie Exp $ PROG = kdestroy @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kuser CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes SRCS = kdestroy.c diff --git a/kerberosIV/usr.bin/kftp/Makefile b/kerberosIV/usr.bin/kftp/Makefile index 8725a827b12..dcf87ddab18 100644 --- a/kerberosIV/usr.bin/kftp/Makefile +++ b/kerberosIV/usr.bin/kftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:30 hin Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:18 espie Exp $ PROG = kftp @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/appl/ftp/common ${KRBSRC}/appl/ftp/ftp CFLAGS += -I. -I${KRBSRC}/appl/ftp/common +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} ${LIBREADLINE} ${LIBCURSES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes -lreadline -lcurses SRCS = sockbuf.c buffer.c common.h cmds.c cmdtab.c extern.h \ diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile index 0f73c432ca4..1402616c00e 100644 --- a/kerberosIV/usr.bin/kinit/Makefile +++ b/kerberosIV/usr.bin/kinit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/01/09 02:41:20 angelos Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:18 espie Exp $ PROG = kinit @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kuser CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes SRCS = kinit.c diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile index 57565e3f917..3d8600d98b0 100644 --- a/kerberosIV/usr.bin/klist/Makefile +++ b/kerberosIV/usr.bin/klist/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:20 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $ PROG = klist @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kuser CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes SRCS = klist.c diff --git a/kerberosIV/usr.bin/kstring2key/Makefile b/kerberosIV/usr.bin/kstring2key/Makefile index 3e103340212..660b4725f85 100644 --- a/kerberosIV/usr.bin/kstring2key/Makefile +++ b/kerberosIV/usr.bin/kstring2key/Makefile @@ -1,13 +1,14 @@ -# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:31 hin Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $ PROG = kstring2key KRBDEPTH=../.. -.include <../../Makefile.inc> +.include "../../Makefile.inc" .PATH: ${KRBSRC}/appl/afsutil CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBDES} LDADD += ${LIBROKEN} -lkrb -lkafs -ldes SRCS = kstring2key.c diff --git a/kerberosIV/usr.bin/pagsh/Makefile b/kerberosIV/usr.bin/pagsh/Makefile index df8aa16ebe0..afbab577a3a 100644 --- a/kerberosIV/usr.bin/pagsh/Makefile +++ b/kerberosIV/usr.bin/pagsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:20 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $ PROG = pagsh @@ -8,6 +8,7 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/appl/afsutil CFLAGS += -I. +DPADD += ${LIBKRB} ${LIBKAFS} ${LIBCRYPTO} LDADD += ${LIBROKEN} -lkrb -lkafs -lcrypto SRCS = pagsh.c diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index 6318bee2a99..f91ab5db181 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/28 01:25:02 hugh Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ PROG = ext_srvtab @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkdb -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = ext_srvtab.c diff --git a/kerberosIV/usr.sbin/kadmin/Makefile b/kerberosIV/usr.sbin/kadmin/Makefile index 73aeaf217da..cc7b803f5e8 100644 --- a/kerberosIV/usr.sbin/kadmin/Makefile +++ b/kerberosIV/usr.sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/01/09 02:41:21 angelos Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $ PROG = kadmin @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kadmin ${KRBSRC}/lib/sl CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/acl -I${KRBSRC}/lib/krb +DPADD += ${LIBKAFS} ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBCURSES} LDADD += ${LIBROKEN} -lkafs -lkadm -lkrb -ldes -lcom_err -lreadline -lcurses SRCS = kadmin.c random_password.c new_pwd.c sl.c diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index 5521e4a8b1c..eda5eb49430 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/07/09 16:45:29 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:19 espie Exp $ PROG = kdb_destroy @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = kdb_destroy.c diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index 94244c27b02..9ef71f2fcb7 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ PROG = kdb_edit @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkrb -lkdb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = kdb_edit.c diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index 6c6434882f6..992f7e677b8 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/28 01:25:02 hugh Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ PROG = kdb_init @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkdb -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = kdb_init.c diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index cde8531ed2b..9a308f9ca70 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/28 01:25:03 hugh Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ PROG = kdb_util @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkdb -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = kdb_util.c diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile index 95e88720f58..ea83922267b 100644 --- a/kerberosIV/usr.sbin/kprop/Makefile +++ b/kerberosIV/usr.sbin/kprop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/07/01 21:47:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ PROG = kprop @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/slave ${KRBSRC}/lib/sl CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/krb -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBKADM} ${LIBDES} \ + ${LIBASN1} ${LIBCOM_ERR} ${LIBACL} ${LIBCRYPTO} LDADD += -lkafs -lkrb5 -lkrb -lkdb -lkadm -ldes -lasn1 -lcom_err \ -lacl -lcrypto ${LIBROKEN} diff --git a/kerberosIV/usr.sbin/ksrvutil/Makefile b/kerberosIV/usr.sbin/ksrvutil/Makefile index 3c66d567571..b80f07b5620 100644 --- a/kerberosIV/usr.sbin/ksrvutil/Makefile +++ b/kerberosIV/usr.sbin/ksrvutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/28 01:25:03 hugh Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ PROG = ksrvutil @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/kadmin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/krb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKADM} ${LIBKRB} ${LIBDES} \ + ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} LDADD += -lkafs -lkrb5 -lkdb -lkadm -lkrb -ldes -lcrypto -lasn1 -lcom_err ${LIBROKEN} SRCS = ksrvutil.c ksrvutil_get.c diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index 141e63bdf76..0a28447bf3f 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/28 01:25:03 hugh Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ PROG = kstash @@ -8,6 +8,8 @@ KRBDEPTH=../.. .PATH: ${KRBSRC}/admin CFLAGS += -I. -I${KRBSRC}/lib/kadm -I${KRBSRC}/lib/kdb +DPADD += ${LIBKAFS} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPTO} \ + ${LIBASN1} LDADD += -lkafs -lkrb5 -lkdb -lkrb -ldes -lcrypto -lasn1 ${LIBROKEN} SRCS = kstash.c diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile index d5e6201a68d..9f353be5e0b 100644 --- a/kerberosV/libexec/hprop/Makefile +++ b/kerberosV/libexec/hprop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= hprop.c mit_dump.c v4_dump.c hprop.h kadb.h .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKDB} ${LIBKRB} ${LIBKDB} ${LIBASN1} \ + ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} ${LIBCRYPTO} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkdb -lkrb -lkdb ${LIBROKEN} -lasn1 \ -lcom_err -lkafs -ldes -lcrypto diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile index e4ae0cabccb..44b215a1098 100644 --- a/kerberosV/libexec/hpropd/Makefile +++ b/kerberosV/libexec/hpropd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= hpropd.c .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKDB} ${LIBKRB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkdb -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -lkafs -ldes diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile index ce41ed3cade..042ad6c349d 100644 --- a/kerberosV/libexec/ipropd-master/Makefile +++ b/kerberosV/libexec/ipropd-master/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -11,6 +11,8 @@ NOMAN= .PATH: ${KRB5SRC}/lib/kadm5 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -lhdb -lkafs -lutil -ldes diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile index d5e60c35778..438a3ea00a8 100644 --- a/kerberosV/libexec/ipropd-slave/Makefile +++ b/kerberosV/libexec/ipropd-slave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -11,6 +11,8 @@ NOMAN= .PATH: ${KRB5SRC}/lib/kadm5 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBKDB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} ${LIBDES} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkrb -lkdb ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -lhdb -lkafs -lutil -ldes diff --git a/kerberosV/libexec/kadmind/Makefile b/kerberosV/libexec/kadmind/Makefile index b9272287e34..571da08c436 100644 --- a/kerberosV/libexec/kadmind/Makefile +++ b/kerberosV/libexec/kadmind/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/11/20 01:54:58 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= kadmind.c server.c version4.c kadm_conn.c .PATH: ${KRB5SRC}/kadmin CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -lkafs -lutil diff --git a/kerberosV/libexec/kdc/Makefile b/kerberosV/libexec/kdc/Makefile index 2f7f2e54032..a443a1106f8 100644 --- a/kerberosV/libexec/kdc/Makefile +++ b/kerberosV/libexec/kdc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2002/02/06 09:13:34 hin Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -20,6 +20,8 @@ SRCS= 524.c \ .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/kdc +DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} LDADD+= -lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs -lutil .include <bsd.prog.mk> diff --git a/kerberosV/libexec/kfd/Makefile b/kerberosV/libexec/kfd/Makefile index eecb8ead1e2..6157c977732 100644 --- a/kerberosV/libexec/kfd/Makefile +++ b/kerberosV/libexec/kfd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/07/18 20:24:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= kfd.c .PATH: ${KRB5SRC}/appl/kf CFLAGS+=-I${KRB5SRC}/lib/krb5 +DPADD+= ${LIBHDB} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} ${LIBKAFS} LDADD+= -lhdb -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs .include <bsd.prog.mk> diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile index 720b3c7015b..c1ca4ce5e6d 100644 --- a/kerberosV/libexec/kpasswdd/Makefile +++ b/kerberosV/libexec/kpasswdd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/11/20 01:54:58 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -8,6 +8,8 @@ MAN= ${PROG}.8 .PATH: ${KRB5SRC}/kpasswd CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBHDB} ${LIBKADM5SRV} ${LIBKRB5} ${LIBKRB} ${LIBDES} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBUTIL} LDADD+= -lhdb -lkadm5srv -lkrb5 -lkrb -ldes ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -lkafs -lutil diff --git a/kerberosV/usr.bin/kauth/Makefile b/kerberosV/usr.bin/kauth/Makefile index 56fe595fc6a..335ddc07e4d 100644 --- a/kerberosV/usr.bin/kauth/Makefile +++ b/kerberosV/usr.bin/kauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/02/06 09:13:34 hin Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= kinit.c .PATH: ${KRB5SRC}/kuser +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile index 9eb171e0d3e..1fe3dd50d89 100644 --- a/kerberosV/usr.bin/kdestroy/Makefile +++ b/kerberosV/usr.bin/kdestroy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/06/23 00:17:46 hin Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,6 +9,8 @@ SRCS= kdestroy.c .PATH: ${KRB5SRC}/kuser +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -lkrb -lasn1 -lcrypto ${LIBROKEN} -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/kf/Makefile b/kerberosV/usr.bin/kf/Makefile index 7e9c10bc89a..48e0551c8df 100644 --- a/kerberosV/usr.bin/kf/Makefile +++ b/kerberosV/usr.bin/kf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2001/06/24 05:45:48 hin Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,6 +9,8 @@ SRCS= kf.c .PATH: ${KRB5SRC}/appl/kf +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -l45 -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile index 5ce36ad6cb9..c44c31102dc 100644 --- a/kerberosV/usr.bin/kinit/Makefile +++ b/kerberosV/usr.bin/kinit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/02/06 09:13:34 hin Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -8,7 +8,9 @@ MLINKS= kinit.1 kauth.1 .PATH: ${KRB5SRC}/kuser +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIB45} ${LIBKRB} ${LIBKAFS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -l45 -lkrb -lkafs ${LIBROKEN} -lasn1 -lcrypto \ -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/klist/Makefile b/kerberosV/usr.bin/klist/Makefile index 1c6c836f312..47683a6721c 100644 --- a/kerberosV/usr.bin/klist/Makefile +++ b/kerberosV/usr.bin/klist/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/06/23 00:17:47 hin Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= klist.c .PATH: ${KRB5SRC}/kuser CFLAGS+=-I${KRB5SRC}/lib/roken +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err .include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/pagsh/Makefile b/kerberosV/usr.bin/pagsh/Makefile index 5408e9d90f5..f9f07d2749f 100644 --- a/kerberosV/usr.bin/pagsh/Makefile +++ b/kerberosV/usr.bin/pagsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/06/23 12:48:44 hin Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,6 +9,8 @@ PROG= pagsh NOMAN= CFLAGS+=-I${KRB5SRC}/lib/roken +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/string2key/Makefile b/kerberosV/usr.bin/string2key/Makefile index 39c1be12e0b..60db0a82632 100644 --- a/kerberosV/usr.bin/string2key/Makefile +++ b/kerberosV/usr.bin/string2key/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2001/06/27 16:17:10 hin Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,6 +9,8 @@ MAN= ${PROG}.8 .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/kdc -I${KRB5SRC}/lib/krb5 +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile index 2d4add8a475..d8ec5c22e2e 100644 --- a/kerberosV/usr.bin/verify_krb5_conf/Makefile +++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2001/06/23 21:54:09 hin Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -9,6 +9,8 @@ PROG= verify_krb5_conf MAN= ${PROG}.8 CFLAGS+=-I${KRB5SRC}/lib/roken +DPADD+= ${LIBKRB5} ${LIBDES} ${LIBKAFS} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} \ + ${LIBCOM_ERR} LDADD+= -lkrb5 -ldes -lkafs -lkrb ${LIBROKEN} -lasn1 -lcrypto -lcom_err -.include <bsd.prog.mk>
\ No newline at end of file +.include <bsd.prog.mk> diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile index 731e57f4e92..5d0184ce93b 100644 --- a/kerberosV/usr.sbin/kadmin/Makefile +++ b/kerberosV/usr.sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/11 00:20:19 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -26,6 +26,9 @@ SRCS= ank.c \ .PATH: ${KRB5SRC}/kadmin CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBHDB} ${LIBKADM5SRV} ${LIBKADM5CLNT} \ + ${LIBKRB5} ${LIBKRB} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} \ + ${LIBDES} LDADD+= ${LIBSL} -lreadline -lcurses -lhdb -lkadm5srv \ -lkadm5clnt -lkrb5 ${LIBROKEN} -lkrb -lasn1 -lcrypto -lcom_err -lkafs -ldes diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile index ac77da5383c..c7690fcb4f4 100644 --- a/kerberosV/usr.sbin/kstash/Makefile +++ b/kerberosV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/07/18 20:24:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -10,6 +10,8 @@ SRCS= kstash.c .PATH: ${KRB5SRC}/kdc CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKRB} ${LIBDES} ${LIBHDB} ${LIBKRB5} \ + ${LIBKADM5SRV} ${LIBKADM5CLNT} ${LIBKAFS} LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -ldes -lhdb \ -lkrb5 -lkadm5srv -lkadm5clnt ${LIBROKEN} -lkafs diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile index 3aefbb34871..05c1f496c9f 100644 --- a/kerberosV/usr.sbin/ktutil/Makefile +++ b/kerberosV/usr.sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/03/04 23:26:43 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -18,6 +18,9 @@ SRCS= add.c \ .PATH: ${KRB5SRC}/admin CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 +DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKRB} ${LIBHDB} ${LIBADM5SRV} \ + ${LIBKADM5CLNT} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} \ + ${LIBKAFS} ${LIBDES} LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -lhdb -lkadm5srv -lkadm5clnt \ -lhdb -lkrb5 ${LIBROKEN} -lasn1 -lcrypto -lcom_err -lkafs -ldes diff --git a/libexec/login_chpass/Makefile b/libexec/login_chpass/Makefile index f4526bd3371..e56255f4213 100644 --- a/libexec/login_chpass/Makefile +++ b/libexec/login_chpass/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2000/12/12 02:30:44 millert Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:20 espie Exp $ PROG= login_chpass @@ -13,7 +13,7 @@ CFLAGS+=-Wall .if (${KERBEROS:L} == "yes") CFLAGS+=-DKERBEROS SRCS+= new_pwd.c -DPADD+= ${LIBKRB} ${LIBDES} +DPADD+= ${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOM_ERR} LDADD+= -lkadm -lkrb -ldes -lcom_err .endif .if (${YP:L} == "yes") diff --git a/libexec/login_krb4-or-pwd/Makefile b/libexec/login_krb4-or-pwd/Makefile index 71d0c834512..f8f97c65ce7 100644 --- a/libexec/login_krb4-or-pwd/Makefile +++ b/libexec/login_krb4-or-pwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/05 00:09:31 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:20 espie Exp $ .include <bsd.own.mk> @@ -8,8 +8,8 @@ MAN= ${PROG}.8 CFLAGS+=-DPASSWD -Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS:L} == "yes") -SRCS+= login_krb4.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} +SRCS+= login_krb4.c +DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} ${LIBDES} LDADD+= -lkrb -lcrypto -lutil -ldes CFLAGS+=-DKRB4 .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb4 diff --git a/libexec/login_krb4/Makefile b/libexec/login_krb4/Makefile index ddaec72188a..07cfeaa5a4a 100644 --- a/libexec/login_krb4/Makefile +++ b/libexec/login_krb4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/03/05 00:09:31 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:20 espie Exp $ .include <bsd.own.mk> @@ -10,7 +10,7 @@ CFLAGS+=-Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS:L} == "yes") SRCS+= login_krb4.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} +DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBDES} LDADD+= -lkrb -lcrypto -ldes CFLAGS+=-DKRB4 .endif diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile index 6456171a1a1..c9e5fdff751 100644 --- a/libexec/login_krb5-or-pwd/Makefile +++ b/libexec/login_krb5-or-pwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2002/03/05 00:09:32 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ .include <bsd.own.mk> @@ -9,7 +9,8 @@ CFLAGS+=-DPASSWD -Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} +DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBUTIL} ${LIBKRB5} ${LIBKASN1} \ + ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkrb -lutil -lkafs -ldes CFLAGS+=-DKRB524 -DKRB5 .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile index a57e67f3bcf..667a5a34093 100644 --- a/libexec/login_krb5/Makefile +++ b/libexec/login_krb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/03/05 00:09:32 deraadt Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/11 00:20:20 espie Exp $ .include <bsd.own.mk> @@ -10,7 +10,8 @@ CFLAGS+=-Wall -Werror -I${.CURDIR}/../login_passwd .if (${KERBEROS:L} == "yes") SRCS+= login_krb5.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} \ + ${LIBDES} LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkrb -lkafs -ldes CFLAGS+=-DKRB524 -DKRB5 .endif diff --git a/regress/lib/libc_r/pcap/Makefile b/regress/lib/libc_r/pcap/Makefile index 977712de20d..db6184ea0f9 100644 --- a/regress/lib/libc_r/pcap/Makefile +++ b/regress/lib/libc_r/pcap/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2002/02/17 01:12:09 marc Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ PROG= pcap +DPADD+= ${LIBPCAP} LDADD+= -lpcap REGRESSTARGETS= sudo-regress-${PROG} diff --git a/regress/lib/libpthread/pcap/Makefile b/regress/lib/libpthread/pcap/Makefile index 977712de20d..db6184ea0f9 100644 --- a/regress/lib/libpthread/pcap/Makefile +++ b/regress/lib/libpthread/pcap/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2002/02/17 01:12:09 marc Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ PROG= pcap +DPADD+= ${LIBPCAP} LDADD+= -lpcap REGRESSTARGETS= sudo-regress-${PROG} diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 185cec3aa50..49c840190de 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1998/07/24 00:10:51 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ PROG= fsdb MAN= fsdb.8 @@ -7,7 +7,7 @@ SRCS= fsdb.c fsdbutil.c fsutil.c \ pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../../sbin/fsck -I${.CURDIR}/../../sbin/fsck_ffs LDADD+= -ledit -lcurses -DPADD+= ${LIBEDIT} ${LIBTERMCAP} +DPADD+= ${LIBEDIT} ${LIBCURSES} .PATH: ${.CURDIR}/../../sbin/fsck ${.CURDIR}/../../sbin/fsck_ffs ${.CURDIR}/../../sys/ufs/ffs .include <bsd.prog.mk> diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile index 318de8f0fd7..776340a5cb3 100644 --- a/sbin/pflogd/Makefile +++ b/sbin/pflogd/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2001/12/01 23:27:23 miod Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ CFLAGS+=-Wall -Werror LDADD+= -lpcap -lutil -DPAPP+= ${LIBUTIL} +DPAPP+= ${LIBPCAP} ${LIBUTIL} PROG= pflogd SRCS= pflogd.c diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 7ae2c771e0a..6854e3c5c90 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.README,v 1.30 2002/01/01 23:52:32 provos Exp $ +# $OpenBSD: bsd.README,v 1.31 2002/05/11 00:20:21 espie Exp $ # $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $ # @(#)bsd.README 5.1 (Berkeley) 5/11/90 @@ -349,38 +349,44 @@ DPADD Additional dependencies for the program. Usually used for The following libraries are predefined for DPADD: - LIBC /lib/libc.a + LIB45 /usr/lib/lib45.a + LIBASN1 /usr/lib/libasn1.a + LIBC /usr/lib/libc.a + LIBCOM_ERR /usr/lib/libcom_err.a LIBCOMPAT /usr/lib/libcompat.a - LIBCURSES /usr/lib/libcurses.a LIBCRYPTO /usr/lib/libcrypto.a - LIBDBM /usr/lib/libdbm.a + LIBCURSES /usr/lib/libcurses.a LIBDES /usr/lib/libdes.a LIBEDIT /usr/lib/libedit.a LIBGCC /usr/lib/libgcc.a + LIBHDB /usr/lib/libhdb.a + LIBKADM /usr/lib/libkadm.a + LIBKADM5CLNT /usr/lib/libkadm5clnt.a + LIBKADM5SRV /usr/lib/libkadm5srv.a + LIBKAFS /usr/lib/libkafs.a LIBKDB /usr/lib/libkdb.a LIBKEYNOTE /usr/lib/libkeynote.a - LIBKDB /usr/lib/libkdb.a LIBKRB /usr/lib/libkrb.a - LIBKAFS /usr/lib/libkafs.a + LIBKRB5 /usr/lib/libkrb5.a LIBKVM /usr/lib/libkvm.a LIBL /usr/lib/libl.a LIBM /usr/lib/libm.a - LIBMP /usr/lib/libmp.a LIBOLDCURSES /usr/lib/libocurses.a - LIBPC /usr/lib/libpc.a + LIBPCAP /usr/lib/libpcap.a LIBPERL /usr/lib/libperl.a - LIBPLOT /usr/lib/libplot.a - LIBRESOLV /usr/lib/libresolv.a LIBRPCSVC /usr/lib/librpcsvc.a + LIBSECTOK /usr/lib/libsectok.a LIBSKEY /usr/lib/libskey.a LIBSSL /usr/lib/libssl.a LIBTELNET /usr/lib/libtelnet.a LIBTERMCAP /usr/lib/libtermcap.a LIBTERMLIB /usr/lib/libtermlib.a + LIBUSB /usr/lib/libusbhid.a LIBUTIL /usr/lib/libutil.a LIBWRAP /usr/lib/libwrap.a - LIBZ /usr/lib/libz.a LIBY /usr/lib/liby.a + LIBZ /usr/lib/libz.a + LIBARCH arch-dependent stuff SHAREDSTRINGS If defined, a new .c.o rule is used that results in shared strings, using xstr(1). Note that this will not work with diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index bdcc151824b..a672e9c742d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.prog.mk,v 1.30 2001/08/23 16:39:33 art Exp $ +# $OpenBSD: bsd.prog.mk,v 1.31 2002/05/11 00:20:21 espie Exp $ # $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 @@ -23,38 +23,58 @@ CRTEND?= ${DESTDIR}/usr/lib/crtend.o .endif LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o +LIB45?= ${DESTDIR}/usr/lib/lib45.a +LIBACL?= ${DESTDIR}/usr/lib/libacl.a +LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a LIBC?= ${DESTDIR}/usr/lib/libc.a +LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a -LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a -LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a +LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBDES?= ${DESTDIR}/usr/lib/libdes.a LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a +LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a +LIBKADM?= ${DESTDIR}/usr/lib/libkadm.a +LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a +LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a +LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a LIBKEYNOTE?= ${DESTDIR}/usr/lib/libkeynote.a LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a -LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a +LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a LIBL?= ${DESTDIR}/usr/lib/libl.a LIBM?= ${DESTDIR}/usr/lib/libm.a -LIBMP?= ${DESTDIR}/usr/lib/libmp.a LIBOLDCURSES?= ${DESTDIR}/usr/lib/libocurses.a -LIBPC?= ${DESTDIR}/usr/lib/libpc.a +LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a LIBPERL?= ${DESTDIR}/usr/lib/libperl.a -LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a -LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a +LIBSECTOK?= ${DESTDIR}/usr/lib/libsectok.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a LIBSSL?= ${DESTDIR}/usr/lib/libssl.a LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a LIBTERMLIB?= ${DESTDIR}/usr/lib/libtermlib.a +LIBUSB?= ${DESTDIR}/usr/lib/libusbhid.a LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a LIBY?= ${DESTDIR}/usr/lib/liby.a LIBZ?= ${DESTDIR}/usr/lib/libz.a +.if ${MACHINE_ARCH} == "i386" +LIBARCH?= ${DESTDIR}/usr/lib/libi386.a +.else +LIBARCH?= +.endif + +# old stuff +LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a +LIBMP?= ${DESTDIR}/usr/lib/libmp.a +LIBPC?= ${DESTDIR}/usr/lib/libpc.a +LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a +LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a + .if defined(SHAREDSTRINGS) CLEANFILES+=strings .c.o: diff --git a/sys/arch/amiga/stand/boot/txlt/Makefile b/sys/arch/amiga/stand/boot/txlt/Makefile index 8a13db5974c..5d044bdba59 100644 --- a/sys/arch/amiga/stand/boot/txlt/Makefile +++ b/sys/arch/amiga/stand/boot/txlt/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 1997/01/16 09:26:55 niklas Exp $ +# $OpenBSD: Makefile,v 1.2 2002/05/11 00:20:20 espie Exp $ PROG=txlt NOMAN=noman +DPADD=${LIBL} LDADD=-ll CLEANFILES+=txlt.c diff --git a/usr.bin/encrypt/Makefile b/usr.bin/encrypt/Makefile index edcd7d461d8..e8f0d120bea 100644 --- a/usr.bin/encrypt/Makefile +++ b/usr.bin/encrypt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1998/04/11 09:46:38 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:20 espie Exp $ LDSTATIC= ${STATIC} PROG= encrypt @@ -6,6 +6,7 @@ SRCS= encrypt.c pwd_gensalt.c .PATH: ${.CURDIR}/../passwd LDADD = -lutil +DPADD= ${LIBUTIL} LIBEXEC?= /usr/libexec LINKS= ${BINDIR}/encrypt ${LIBEXEC}/makekey diff --git a/usr.bin/keynote/Makefile b/usr.bin/keynote/Makefile index 1b668e23c19..3610ddd2f72 100644 --- a/usr.bin/keynote/Makefile +++ b/usr.bin/keynote/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/07/20 20:05:58 mickey Exp $ +# $OpenBSD: Makefile,v 1.10 2002/05/11 00:20:20 espie Exp $ PROG= keynote SRCS= keynote-sign.c keynote-keygen.c keynote-sigver.c keynote-verify.c \ @@ -6,6 +6,7 @@ SRCS= keynote-sign.c keynote-keygen.c keynote-sigver.c keynote-verify.c \ CFLAGS+= -Wall -DCRYPTO -DHAVE_CONFIG_H -I. -I${.CURDIR} LEXFLAGS2= -Pkv -s -i YACCFLAGS2= -d -p kv -b z +DPADD= ${LIBKEYNOTE} ${LIBM} ${LIBCRYPTO} LDADD= -lkeynote -lm -lcrypto CLEANFILES+= lex.kv.c z.tab.c z.tab.h MAN= keynote.1 diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile index 34b0a85e72f..763b99d21ea 100644 --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 1997/09/21 11:49:29 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:18 espie Exp $ PROG= lastcomm -DPADD= ${LIBMATH} +DPADD= ${LIBM} LDADD= -lm .include <bsd.prog.mk> diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 1c3619a0feb..ad3f0745a54 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.6 1998/07/24 00:10:57 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $ PROG= msgs -DPADD= ${LIBTERMLIB} +DPADD= ${LIBCURSES} LDADD= -lcurses .include <bsd.prog.mk> diff --git a/usr.bin/pmdb/Makefile b/usr.bin/pmdb/Makefile index 12b41cc69d8..8f19d4e175d 100644 --- a/usr.bin/pmdb/Makefile +++ b/usr.bin/pmdb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/03/15 16:51:29 art Exp $ +# $OpenBSD: Makefile,v 1.6 2002/05/11 00:20:20 espie Exp $ .include <bsd.own.mk> @@ -29,7 +29,7 @@ CPPFLAGS+=-DPMDB_AOUT .endif LDADD=-ledit -lcurses -DPADD=${LIBEDIT} ${LIBTERMCAP} +DPADD=${LIBEDIT} ${LIBCURSES} CPPFLAGS+=-I${.CURDIR} diff --git a/usr.bin/sectok/Makefile b/usr.bin/sectok/Makefile index 5b3a86ff174..5c66bfc7a99 100644 --- a/usr.bin/sectok/Makefile +++ b/usr.bin/sectok/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2002/03/05 00:33:32 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= sectok SRCS= main.c cmds.c cyberflex.c +DPADD= ${LIBSECTOK} ${LIBCRYPTO} ${LIBDES} LDADD= -lsectok -lcrypto -ldes CFLAGS+=-Wall diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile index 0bdeaa7a9ed..95b092924b3 100644 --- a/usr.bin/ssh/ssh/Makefile +++ b/usr.bin/ssh/ssh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2002/05/04 03:00:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.39 2002/05/11 00:20:20 espie Exp $ .PATH: ${.CURDIR}/.. @@ -20,7 +20,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV LDADD+= -lkrb5 -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBASN1} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 .if (${KERBEROS:L} == "yes") @@ -30,11 +30,11 @@ DPADD+= ${LIBKRB} .if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs -DPADD+= ${LIBKRBAFS} +DPADD+= ${LIBKAFS} .endif # AFS .endif # KERBEROS .include <bsd.prog.mk> LDADD+= -lcrypto -lz -ldes -DPADD+= ${LIBCRYPTO} ${LIBZ} +DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBDES} diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile index 8e495457854..c51d4fbb62b 100644 --- a/usr.bin/ssh/sshd/Makefile +++ b/usr.bin/ssh/sshd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2002/03/18 17:50:31 provos Exp $ +# $OpenBSD: Makefile,v 1.48 2002/05/11 00:20:18 espie Exp $ .PATH: ${.CURDIR}/.. @@ -21,14 +21,14 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV SRCS+= auth-krb5.c LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} +DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR} .endif # KERBEROS5 .if (${KERBEROS:L} == "yes") .if (${AFS:L} == "yes") CFLAGS+= -DAFS LDADD+= -lkafs -DPADD+= ${LIBKRBAFS} +DPADD+= ${LIBKAFS} .endif # AFS CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV SRCS+= auth-krb4.c @@ -39,7 +39,7 @@ DPADD+= ${LIBKRB} .include <bsd.prog.mk> LDADD+= -lcrypto -lutil -lz -ldes -DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES} .if (${TCP_WRAPPERS:L} == "yes") CFLAGS+= -DLIBWRAP diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index eaf6570f73e..7703cf4a459 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2002/03/05 00:43:45 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2002/05/11 00:20:20 espie Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -49,13 +49,13 @@ SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \ .if (${KERBEROS5:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs -ldes -DPADD+= ${LIBKRB5} +DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES} .endif .if (${KERBEROS:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4 LDADD+= -lkrb -lcrypto -ldes -DPADD+= ${LIBDES} ${LIBKRB} +DPADD+= ${LIBDES} ${LIBKRB} ${LIBDES} .endif .include <bsd.prog.mk> diff --git a/usr.bin/x99token/Makefile b/usr.bin/x99token/Makefile index d87edf82af1..9b23a6761b9 100644 --- a/usr.bin/x99token/Makefile +++ b/usr.bin/x99token/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2001/08/14 00:56:58 millert Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= x99token LDADD+= -ldes +DPADD+= ${LIBDES} .include <bsd.prog.mk> diff --git a/usr.sbin/afs/Applflags.inc b/usr.sbin/afs/Applflags.inc index 22bde48c569..a9d0cfbb2ee 100644 --- a/usr.sbin/afs/Applflags.inc +++ b/usr.sbin/afs/Applflags.inc @@ -1,5 +1,9 @@ -LDADD += -lkrb5 -lkrb -lcrypto ../libarla/libarla.a -ltermcap ../libroken/libroken.a -lreadline -lcurses -lkafs -lasn1 -lcom_err -ldes -DPADD += ../libroken/libroken.a ../libarla/libarla.a ${LIBKRB} ${LIBDES} ${LIBREADLINE} ${LIBTERMCAP} ${LIBCURSES} ${LIBKAFS} +LDADD += -lkrb5 -lkrb -lcrypto ../libarla/libarla.a -ltermcap \ + ../libroken/libroken.a -lreadline -lcurses -lkafs -lasn1 \ + -lcom_err -ldes +DPADD += ../libroken/libroken.a ../libarla/libarla.a ${LIBKRB} ${LIBDES} \ + ${LIBREADLINE} ${LIBTERMCAP} ${LIBCURSES} ${LIBKAFS} \ + ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} CFLAGS += -I${.CURDIR}/../src/util -I${.CURDIR}/../src/lib/roken \ -I${.CURDIR}/../src/include -I${.CURDIR}/../libroken \ -I${.CURDIR}/../src/rxdef -I${.CURDIR}/../src/lwp -I../libarla \ diff --git a/usr.sbin/mopd/mopchk/Makefile b/usr.sbin/mopd/mopchk/Makefile index c441db3f4be..3187edb9543 100644 --- a/usr.sbin/mopd/mopchk/Makefile +++ b/usr.sbin/mopd/mopchk/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 1996/09/21 19:12:12 maja Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= mopchk SRCS= mopchk.c device.c version.c pf.c loop-bsd.c file.c CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common -DINFO CLEANFILES= version.c version.h +DPADD= ${LIBKVM} LDADD= -lkvm .PATH: ${.CURDIR}/.. ${.CURDIR}/../common diff --git a/usr.sbin/mopd/mopd/Makefile b/usr.sbin/mopd/mopd/Makefile index 860763c0c93..196d563b325 100644 --- a/usr.sbin/mopd/mopd/Makefile +++ b/usr.sbin/mopd/mopd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1996/09/21 19:12:21 maja Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= mopd SRCS= mopd.c process.c print.c cmp.c get.c put.c mopdef.c nma.c device.c \ @@ -6,6 +6,7 @@ SRCS= mopd.c process.c print.c cmp.c get.c put.c mopdef.c nma.c device.c \ MAN= mopd.8 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common CLEANFILES= version.c version.h +DPADD= ${LIBKVM} LDADD= -lkvm .PATH: ${.CURDIR}/../common diff --git a/usr.sbin/mopd/mopprobe/Makefile b/usr.sbin/mopd/mopprobe/Makefile index e2c7260bbb1..75ba3d07e7a 100644 --- a/usr.sbin/mopd/mopprobe/Makefile +++ b/usr.sbin/mopd/mopprobe/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 1999/03/27 14:31:22 maja Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:20 espie Exp $ PROG= mopprobe SRCS= mopprobe.c device.c get.c cmp.c mopdef.c version.c pf.c loop-bsd.c \ print.c nma.c CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common -DNODL CLEANFILES= version.c version.h +DPADD= ${LIBKVM} LDADD= -lkvm .PATH: ${.CURDIR}/../common diff --git a/usr.sbin/mopd/moptrace/Makefile b/usr.sbin/mopd/moptrace/Makefile index a4b5e15c8bf..187d2ea8e7b 100644 --- a/usr.sbin/mopd/moptrace/Makefile +++ b/usr.sbin/mopd/moptrace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1996/09/21 19:12:37 maja Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= moptrace SRCS= moptrace.c print.c cmp.c get.c mopdef.c nma.c device.c version.c pf.c \ @@ -6,6 +6,7 @@ SRCS= moptrace.c print.c cmp.c get.c mopdef.c nma.c device.c version.c pf.c \ MAN= moptrace.1 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/.. -I${.CURDIR}/../common CLEANFILES= version.c version.h +DPADD= ${LIBKVM} LDADD= -lkvm .PATH: ${.CURDIR}/../common diff --git a/usr.sbin/named/addr/Makefile b/usr.sbin/named/addr/Makefile index 624231c97d1..7cc0f70bf2e 100644 --- a/usr.sbin/named/addr/Makefile +++ b/usr.sbin/named/addr/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 1997/03/12 14:54:15 downsj Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ PROG= addr NOMAN= yes CFLAGS+=${INCLUDE} ${CONFIG} -LDADD= ${LIBRESOLV} - .include <bsd.prog.mk> .include "../../Makefile.inc" diff --git a/usr.sbin/named/dnsquery/Makefile b/usr.sbin/named/dnsquery/Makefile index 32cac24778a..ea34e354512 100644 --- a/usr.sbin/named/dnsquery/Makefile +++ b/usr.sbin/named/dnsquery/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 1997/03/12 10:41:49 downsj Exp $ +# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:26:21 mrg Exp $ .PATH: ${.CURDIR}/../man @@ -7,7 +7,5 @@ CFLAGS+=${INCLUDE} ${CONFIG} PROG= dnsquery -LDADD= ${LIBRESOLV} - .include <bsd.prog.mk> .include "../../Makefile.inc" diff --git a/usr.sbin/named/host/Makefile b/usr.sbin/named/host/Makefile index 38167c52505..7e0966d0ef0 100644 --- a/usr.sbin/named/host/Makefile +++ b/usr.sbin/named/host/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1997/03/12 10:41:50 downsj Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:20 espie Exp $ # $NetBSD: Makefile,v 1.2 1996/05/14 13:55:47 mrg Exp $ .PATH: ${.CURDIR}/../man @@ -8,7 +8,5 @@ SRCS = host.c send.c vers.c CFLAGS+=${INCLUDE} ${CONFIG} -LDADD= ${LIBRESOLV} - .include "../../Makefile.inc" .include <bsd.prog.mk> diff --git a/usr.sbin/named/named-xfer/Makefile b/usr.sbin/named/named-xfer/Makefile index 42b0ebf22bb..7e2e9665c38 100644 --- a/usr.sbin/named/named-xfer/Makefile +++ b/usr.sbin/named/named-xfer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1998/05/23 19:24:54 millert Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:20 espie Exp $ # $NetBSD: Makefile,v 1.2 1996/02/04 12:02:12 mrg Exp $ # from: $Id: Makefile,v 8.2 1995/12/31 23:28:01 vixie Exp @@ -8,7 +8,6 @@ PROG= named-xfer SRCS= named-xfer.c db_glue.c storage.c version.c CFLAGS+= ${INCLUDE} -I${.CURDIR}/../named ${CONFIG} -LDADD= ${LIBRESOLV} MAN= named-xfer.8 BINDIR= /var/named LDSTATIC= ${STATIC} diff --git a/usr.sbin/named/named/Makefile b/usr.sbin/named/named/Makefile index debd0c37640..7283c6e3506 100644 --- a/usr.sbin/named/named/Makefile +++ b/usr.sbin/named/named/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1998/05/22 00:47:29 millert Exp $ +# $OpenBSD: Makefile,v 1.4 2002/05/11 00:20:20 espie Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:28:00 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:45 vixie Exp @@ -12,8 +12,6 @@ SRCS= version.c db_dump.c db_glue.c db_load.c db_lookup.c db_reload.c \ MAN= named.8 CFLAGS+=${INCLUDE} ${CONFIG} -LDADD= ${LIBRESOLV} - makeversionc: (u=root d=`pwd` h=localhost t=`date +%c`; \ sed -e "s|%WHEN%|$${t}|" -e "s|%VERSION%|"${VER}"|" \ diff --git a/usr.sbin/named/nslookup/Makefile b/usr.sbin/named/nslookup/Makefile index 3ab1f833a16..8d9cc91cf39 100644 --- a/usr.sbin/named/nslookup/Makefile +++ b/usr.sbin/named/nslookup/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1997/04/27 20:57:03 millert Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/11 00:20:20 espie Exp $ # $NetBSD: Makefile,v 1.1 1996/02/02 15:29:56 mrg Exp $ # from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp @@ -9,7 +9,7 @@ PROG= nslookup SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l CFLAGS+= ${INCLUDE} ${CONFIG} DPADD= ${LIBL} -LDADD= ${LIBRESOLV} -ll +LDADD= -ll CLEANFILES+= commands.c lex.yy.c lex.yy.o MAN= nslookup.8 diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile index d6e11974c80..97131b640d6 100644 --- a/usr.sbin/openssl/Makefile +++ b/usr.sbin/openssl/Makefile @@ -5,6 +5,7 @@ BINOWN= root BINGRP= bin BINMODE= 555 BINDIR= /usr/sbin +DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto NOMAN= not yet kiddies diff --git a/usr.sbin/ppp/ppp/Makefile b/usr.sbin/ppp/ppp/Makefile index cfc993c0f62..e36f5e36e07 100644 --- a/usr.sbin/ppp/ppp/Makefile +++ b/usr.sbin/ppp/ppp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2002/03/31 02:38:49 brian Exp $ +# $OpenBSD: Makefile,v 1.25 2002/05/11 00:20:21 espie Exp $ PROG= ppp SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ @@ -14,7 +14,7 @@ CFLAGS+=-Wall -DNO_FW_PUNCH -DNOI4B -DNONETGRAPH CFLAGS+=-DLOCALNAT -DLOCALRAD M4FLAGS=-DLOCALNAT -DLOCALRAD LDADD+= -lcrypto -ldes -lutil -lz -DPADD+= ${LIBDES} ${LIBUTIL} ${LIBZ} +DPADD+= ${LIBDES} ${LIBUTIL} ${LIBZ} ${LIBCRYPTO} .if defined(NOSUID) || defined(PPP_NOSUID) BINMODE=554 .else |