diff options
Diffstat (limited to 'libexec')
28 files changed, 34 insertions, 76 deletions
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index 2a9851e..5bef488 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -38,9 +38,7 @@ MAN= atf-check.1 CFLAGS+= -I${ATF} CFLAGS+= -DATF_SHELL='"/bin/sh"' -DPADD+= ${LIBATF_CXX} ${LIBATF_C} -LDADD+= ${LDATF_CXX} ${LDATF_C} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx .if ${MK_TESTS} != "no" SUBDIR+= tests diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index 4e14643..f00683f 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -42,9 +42,7 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' CFLAGS+= -DATF_SHELL='"/bin/sh"' CFLAGS+= -I${ATF} -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= ${LDATF_C} ${LDATF_CXX} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx FILESGROUPS= SUBR diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index 2730559..39952fc 100644 --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -17,8 +17,7 @@ CFLAGS+=-DLOGIN_CAP -DPAM WARNS?= 2 WFORMAT=0 -DPADD= ${LIBPAM} ${LIBUTIL} -LDADD= ${MINUSLPAM} -lutil +LIBADD= pam util atrun.8: atrun.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ diff --git a/libexec/casper/dns/Makefile b/libexec/casper/dns/Makefile index 245493e..b101891 100644 --- a/libexec/casper/dns/Makefile +++ b/libexec/casper/dns/Makefile @@ -6,8 +6,7 @@ PROG= dns SRCS= dns.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper diff --git a/libexec/casper/grp/Makefile b/libexec/casper/grp/Makefile index 502cd26..75274d1 100644 --- a/libexec/casper/grp/Makefile +++ b/libexec/casper/grp/Makefile @@ -6,8 +6,7 @@ PROG= grp SRCS= grp.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper diff --git a/libexec/casper/pwd/Makefile b/libexec/casper/pwd/Makefile index ebf6cac..23ad3f2 100644 --- a/libexec/casper/pwd/Makefile +++ b/libexec/casper/pwd/Makefile @@ -6,8 +6,7 @@ PROG= pwd SRCS= pwd.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper diff --git a/libexec/casper/random/Makefile b/libexec/casper/random/Makefile index 46c9739..3b5d155 100644 --- a/libexec/casper/random/Makefile +++ b/libexec/casper/random/Makefile @@ -6,8 +6,7 @@ PROG= random SRCS= random.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper diff --git a/libexec/casper/sysctl/Makefile b/libexec/casper/sysctl/Makefile index 432008e..24152ab 100644 --- a/libexec/casper/sysctl/Makefile +++ b/libexec/casper/sysctl/Makefile @@ -6,8 +6,7 @@ PROG= sysctl SRCS= sysctl.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper diff --git a/libexec/dma/Makefile b/libexec/dma/Makefile index 757faf4..65c73820 100644 --- a/libexec/dma/Makefile +++ b/libexec/dma/Makefile @@ -8,8 +8,7 @@ CFLAGS= -I${.CURDIR}/../../contrib/dma \ -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \ -DDMA_ROOT_USER='"mailnull"' \ -DDMA_GROUP='"mail"' -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD= ssl crypto PROG= dma SRCS= aliases_parse.y \ diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index b6382ad..f710173 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= fingerd -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= fingerd.8 WARNS?= 2 diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 0c7c982..da41967 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -13,19 +13,16 @@ YFLAGS= WARNS?= 2 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +LIBADD= util crypt # XXX Kluge! Conversation mechanism needs to be fixed. -DPADD+= ${LIBOPIE} ${LIBMD} -LDADD+= -lopie -lmd +LIBADD+= opie md LSDIR= ../../bin/ls .PATH: ${.CURDIR}/${LSDIR} SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} -DPADD+= ${LIBM} -LDADD+= -lm +LIBADD+= m .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 @@ -33,8 +30,7 @@ CFLAGS+=-DINET6 .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM -DPADD+= ${LIBPAM} -LDADD+= ${MINUSLPAM} +LIBADD+= pam .endif .include <bsd.prog.mk> diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile index f967958..976d62a 100644 --- a/libexec/getty/Makefile +++ b/libexec/getty/Makefile @@ -3,8 +3,7 @@ PROG= getty SRCS= main.c init.c subr.c chat.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= gettytab.5 ttys.5 getty.8 WARNS?= 1 diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 3e59609..018357c 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -12,11 +12,7 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I. WARNS?= 2 WFORMAT=0 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile index 1ffaffe..09c3ee6 100644 --- a/libexec/pppoed/Makefile +++ b/libexec/pppoed/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= pppoed -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph MAN= pppoed.8 WARNS?= 1 diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile index de0fb20..282ec63 100644 --- a/libexec/rlogind/Makefile +++ b/libexec/rlogind/Makefile @@ -5,8 +5,7 @@ PROG= rlogind MAN= rlogind.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 .if ${MK_INET6_SUPPORT} != "no" diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile index 95d4415..21cb45d 100644 --- a/libexec/rpc.rquotad/Makefile +++ b/libexec/rpc.rquotad/Makefile @@ -4,7 +4,6 @@ PROG = rpc.rquotad SRCS = rquotad.c MAN = rpc.rquotad.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util .include <bsd.prog.mk> diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index a42225f..f408d4a 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -4,8 +4,7 @@ PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c MAN = rpc.rstatd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lrpcsvc -lutil -ldevstat -lkvm +LIBADD= rpcsvc devstat WARNS?= 1 diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index df2be37..9f7240a 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -4,8 +4,7 @@ PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c extern.h MAN = rpc.rusersd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc #.if exists(/usr/X11R6/include/X11/extensions/xidle.h) #CFLAGS+= -DXIDLE diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile index b09d663..6606a17 100644 --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -4,8 +4,7 @@ PROG = rpc.rwalld SRCS = rwalld.c MAN = rpc.rwalld.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile index 5b1cb24..51ac6bf 100644 --- a/libexec/rpc.sprayd/Makefile +++ b/libexec/rpc.sprayd/Makefile @@ -4,8 +4,7 @@ PROG = rpc.sprayd SRCS = sprayd.c MAN = rpc.sprayd.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc WARNS?= 2 diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile index f6881e8..c856995 100644 --- a/libexec/rshd/Makefile +++ b/libexec/rshd/Makefile @@ -7,7 +7,6 @@ MAN= rshd.8 WARNS?= 3 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} +LIBADD= util pam .include <bsd.prog.mk> diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index cc30132..09dc4ab 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -43,16 +43,14 @@ CFLAGS+= -fpic .endif CFLAGS+= -DPIC $(DEBUG) LDFLAGS+= -shared -Wl,-Bsymbolic -DPADD= ${LIBC_PIC} -LDADD= -lc_pic +LIBADD= c_pic .if ${MACHINE_CPUARCH} == "arm" # Some of the required math functions (div & mod) are implemented in # libcompiler_rt on ARM. The library also needs to be placed first to be # correctly linked. As some of the functions are used before we have # shared libraries. -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index ae86155..7e82b22 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -9,11 +9,7 @@ SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm WARNS?= 2 diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index f3fbf29..03e8c52 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -15,8 +15,7 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ CFLAGS+=-DINET6 .endif -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap WARNS?= 1 diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 07de197..7cb9bc9 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -29,20 +29,17 @@ CFLAGS+= -I${TELNETDIR}/telnet LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} -LDADD= -lutil -ltermcapw ${LIBTELNET} +LIBADD= telnet util ncursesw .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION -DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} -LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +LIBADD+= mp crypto pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} -LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err +LIBADD+= krb5 roken .endif .include <bsd.prog.mk> diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile index f005001..015458c 100644 --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -7,7 +7,6 @@ SRCS= tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c SRCS+= tftpd.c WFORMAT=0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include <bsd.prog.mk> diff --git a/libexec/ulog-helper/Makefile b/libexec/ulog-helper/Makefile index 764f0de..b763643 100644 --- a/libexec/ulog-helper/Makefile +++ b/libexec/ulog-helper/Makefile @@ -5,7 +5,6 @@ BINOWN= root BINMODE=4555 MAN= -DPADD= ${LIBULOG} -LDADD= -lulog +LIBADD= ulog .include <bsd.prog.mk> diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index 476a296..d1a2f57 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -16,8 +16,7 @@ CFLAGS+= -I. WARNS?= 2 WFORMAT=0 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= ${GENSRCS} |