diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
| commit | d029c3aa2563f896e990ea62d168f4f33afcbc01 (patch) | |
| tree | 55e479f80b3d04d5fd6accb8908787cccd17d895 /usr.sbin/unbound | |
| parent | 2ac725a4ec9fb21d4e208d428a7e8893a8c84a15 (diff) | |
| download | src-test2-d029c3aa2563f896e990ea62d168f4f33afcbc01.tar.gz src-test2-d029c3aa2563f896e990ea62d168f4f33afcbc01.zip | |
Rework privatelib/internallib
Make sure everything linking to a privatelib and/or an internallib does it directly
from the OBJDIR rather than DESTDIR.
Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing
in final installation
Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to
internal/privatelib
Directly link to the .so in case of private library to avoid having to complexify
LDFLAGS.
Phabric: https://phabric.freebsd.org/D553
Reviewed by: imp, emaste
Notes
Notes:
svn path=/head/; revision=269648
Diffstat (limited to 'usr.sbin/unbound')
| -rw-r--r-- | usr.sbin/unbound/anchor/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/unbound/checkconf/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/unbound/control/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/unbound/daemon/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 14047662b3bb..970fb705e183 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -11,7 +11,7 @@ PROG= unbound-anchor SRCS= unbound-anchor.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lbsdxml -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lbsdxml -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-anchor.8 diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index 6a588066cbd7..0993d3d5745c 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -10,7 +10,7 @@ PROG= unbound-checkconf SRCS= unbound-checkconf.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-checkconf.8 diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index 7056a9e24edd..2989e739ed25 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -11,7 +11,7 @@ SCRIPTS= unbound-control-setup.sh SRCS= unbound-control.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-control.8 diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index 0f9044f885ae..a8b1bb263865 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -10,7 +10,7 @@ PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound.8 unbound.conf.5 |