diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-11-25 11:23:12 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-11-25 11:23:12 +0000 |
| commit | 13eb765f2d1a7497df9f56f5ca95950e04cb4c01 (patch) | |
| tree | 69f31f17bfe80e77e4f38188819e4e69f11b9f25 /sbin/geom | |
| parent | cc0d90a7997d7483dcfb77b908a709fa5561a5fb (diff) | |
| download | src-13eb765f2d1a7497df9f56f5ca95950e04cb4c01.tar.gz src-13eb765f2d1a7497df9f56f5ca95950e04cb4c01.zip | |
Convert sbin/ to LIBADD
Reduce overlinking
Notes
Notes:
svn path=/head/; revision=275030
Diffstat (limited to 'sbin/geom')
| -rw-r--r-- | sbin/geom/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/eli/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/journal/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/mirror/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/part/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/raid/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/raid3/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/core/Makefile | 3 |
8 files changed, 8 insertions, 16 deletions
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index ced58425c657..19a56360ccce 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -14,8 +14,7 @@ MAN= WARNS?= 2 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lgeom -lsbuf -lbsdxml -lutil +LIBADD= geom util .include <bsd.prog.mk> diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile index 119566876d71..f8e453dc616c 100644 --- a/sbin/geom/class/eli/Makefile +++ b/sbin/geom/class/eli/Makefile @@ -8,8 +8,7 @@ SRCS+= g_eli_key.c SRCS+= pkcs5v2.c SRCS+= sha2.c -DPADD= ${LIBMD} ${LIBCRYPTO} -LDADD= -lmd -lcrypto +LIBADD= md crypto WARNS?= 3 diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile index 2db8d3002734..0e1a38ea6dc4 100644 --- a/sbin/geom/class/journal/Makefile +++ b/sbin/geom/class/journal/Makefile @@ -5,8 +5,7 @@ GEOM_CLASS= journal SRCS+= geom_journal_ufs.c -DPADD= ${LIBMD} ${LIBUFS} -LDADD= -lmd -lufs +LIBADD= ufs md CFLAGS+=-I${.CURDIR}/../../../../sys diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile index e38d617b6da5..ce7ee6466326 100644 --- a/sbin/geom/class/mirror/Makefile +++ b/sbin/geom/class/mirror/Makefile @@ -4,7 +4,6 @@ GEOM_CLASS= mirror -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include <bsd.lib.mk> diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile index 341cd42b8c97..4b67de4ef415 100644 --- a/sbin/geom/class/part/Makefile +++ b/sbin/geom/class/part/Makefile @@ -4,7 +4,6 @@ GEOM_CLASS= part -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.lib.mk> diff --git a/sbin/geom/class/raid/Makefile b/sbin/geom/class/raid/Makefile index 743f690f0fd9..07d71403d48f 100644 --- a/sbin/geom/class/raid/Makefile +++ b/sbin/geom/class/raid/Makefile @@ -4,7 +4,6 @@ GEOM_CLASS= raid -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include <bsd.lib.mk> diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile index d2405d4b4f5d..74e12455a432 100644 --- a/sbin/geom/class/raid3/Makefile +++ b/sbin/geom/class/raid3/Makefile @@ -4,7 +4,6 @@ GEOM_CLASS= raid3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include <bsd.lib.mk> diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile index 64edc793a95e..0636d037a358 100644 --- a/sbin/geom/core/Makefile +++ b/sbin/geom/core/Makefile @@ -11,7 +11,6 @@ NO_SHARED=NO CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lgeom -lsbuf -lbsdxml -lutil +LIBADD= geom util .include <bsd.prog.mk> |