Date: Tue, 25 Nov 2014 11:15:40 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275028 - in head/bin: csh df ed ls pkill ps rmail sh Message-ID: <201411251115.sAPBFeAe096329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 25 11:15:40 2014 New Revision: 275028 URL: https://svnweb.freebsd.org/changeset/base/275028 Log: Convert bin/ to LIBADD, reduce overlinking allow to build all components as static Modified: head/bin/csh/Makefile head/bin/df/Makefile head/bin/ed/Makefile head/bin/ls/Makefile head/bin/pkill/Makefile head/bin/ps/Makefile head/bin/rmail/Makefile head/bin/sh/Makefile Modified: head/bin/csh/Makefile ============================================================================== --- head/bin/csh/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/csh/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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 Modified: head/bin/df/Makefile ============================================================================== --- head/bin/df/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/df/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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> Modified: head/bin/ed/Makefile ============================================================================== --- head/bin/ed/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/ed/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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> Modified: head/bin/ls/Makefile ============================================================================== --- head/bin/ls/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/ls/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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> Modified: head/bin/pkill/Makefile ============================================================================== --- head/bin/pkill/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/pkill/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: head/bin/ps/Makefile ============================================================================== --- head/bin/ps/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/ps/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include <bsd.prog.mk> Modified: head/bin/rmail/Makefile ============================================================================== --- head/bin/rmail/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/rmail/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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 Modified: head/bin/sh/Makefile ============================================================================== --- head/bin/sh/Makefile Tue Nov 25 11:14:42 2014 (r275027) +++ head/bin/sh/Makefile Tue Nov 25 11:15:40 2014 (r275028) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251115.sAPBFeAe096329>