diff options
-rw-r--r-- | bin/csh/Makefile | 3 | ||||
-rw-r--r-- | bin/df/Makefile | 3 | ||||
-rw-r--r-- | bin/ed/Makefile | 3 | ||||
-rw-r--r-- | bin/ls/Makefile | 6 | ||||
-rw-r--r-- | bin/pkill/Makefile | 3 | ||||
-rw-r--r-- | bin/ps/Makefile | 3 | ||||
-rw-r--r-- | bin/rmail/Makefile | 6 | ||||
-rw-r--r-- | bin/sh/Makefile | 3 |
8 files changed, 9 insertions, 21 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index fd34524..e3df1d4 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh diff --git a/bin/df/Makefile b/bin/df/Makefile index fb7b09a..5cdae9e 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -9,7 +9,6 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include <bsd.prog.mk> diff --git a/bin/ed/Makefile b/bin/ed/Makefile index cc47a42..bef3ff1 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include <bsd.prog.mk> diff --git a/bin/ls/Makefile b/bin/ls/Makefile index dce2046..58206e0 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include <bsd.prog.mk> diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile index 11bfbe3..84a5af7 100644 --- a/bin/pkill/Makefile +++ b/bin/pkill/Makefile @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 diff --git a/bin/ps/Makefile b/bin/ps/Makefile index 5ba4f2f..30dbdc9 100644 --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps.c # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include <bsd.prog.mk> diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index ad788a4..a74898f 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -14,11 +14,7 @@ MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -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/bin/sh/Makefile b/bin/sh/Makefile index ad43d33..3f28a12 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: |