diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-03 06:22:51 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-03 06:22:51 +0000 |
| commit | b4b2074b9c9493bd2e76157c2b582780ad6a53a9 (patch) | |
| tree | 66d8acc905f8997ced889aee8499739c08fd2323 | |
| parent | 70aaabfeaca395af01baa82155ef9870825d9364 (diff) | |
| download | FreeBSD-src-b4b2074b9c9493bd2e76157c2b582780ad6a53a9.zip FreeBSD-src-b4b2074b9c9493bd2e76157c2b582780ad6a53a9.tar.gz | |
Move casper library entries to proper places.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | share/mk/bsd.libnames.mk | 5 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 25 |
2 files changed, 11 insertions, 19 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 6db6973..d7e00e6 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -30,6 +30,11 @@ LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a +LIBCAP_DNS?= ${DESTDIR}${LIBDIR}/libcap_dns.a +LIBCAP_GRP?= ${DESTDIR}${LIBDIR}/libcap_grp.a +LIBCAP_PWD?= ${DESTDIR}${LIBDIR}/libcap_pwd.a +LIBCAP_RANDOM?= ${DESTDIR}${LIBDIR}/libcap_random.a +LIBCAP_SYSCTL?= ${DESTDIR}${LIBDIR}/libcap_sysctl.a LIBCASPER?= ${DESTDIR}${LIBDIR}/libcasper.a LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a LIBCOMPILER_RT?=${DESTDIR}${LIBDIR}/libcompiler_rt.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 902f4fb..1ff2f6d 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -488,6 +488,12 @@ LIBWINDDIR= ${OBJTOP}/kerberos5/lib/libwind LIBALIASDIR= ${OBJTOP}/lib/libalias/libalias LIBBLOCKSRUNTIMEDIR= ${OBJTOP}/lib/libblocksruntime LIBBSNMPDIR= ${OBJTOP}/lib/libbsnmp/libbsnmp +LIBCAP_CASPERDIR= ${OBJTOP}/lib/libcasper/libcasper +LIBCAP_DNSDIR= ${OBJTOP}/lib/libcasper/services/cap_dns +LIBCAP_GRPDIR= ${OBJTOP}/lib/libcasper/services/cap_grp +LIBCAP_PWDDIR= ${OBJTOP}/lib/libcasper/services/cap_pwd +LIBCAP_RANDOMDIR= ${OBJTOP}/lib/libcasper/services/cap_random +LIBCAP_SYSCTLDIR= ${OBJTOP}/lib/libcasper/services/cap_sysctl LIBBSDXMLDIR= ${OBJTOP}/lib/libexpat LIBKVMDIR= ${OBJTOP}/lib/libkvm LIBPTHREADDIR= ${OBJTOP}/lib/libthr @@ -515,25 +521,6 @@ LIBTERMCAPWDIR= ${LIBNCURSESWDIR} LIB${lib:tu}DIR?= ${OBJTOP}/lib/lib${lib} .endfor -# Casper exception. -LIBCAP_CASPERDIR= ${OBJTOP}/lib/libcasper/libcasper -LIBCAP_CASPER= ${DESTDIR}${LIBDIR}/libcasper.a - -LIBCAP_DNSDIR= ${OBJTOP}/lib/libcasper/services/cap_dns -LIBCAP_DNS?= ${DESTDIR}${LIBDIR}/libcap_dns.a - -LIBCAP_GRPDIR= ${OBJTOP}/lib/libcasper/services/cap_grp -LIBCAP_GRP?= ${DESTDIR}${LIBDIR}/libcap_grp.a - -LIBCAP_PWDDIR= ${OBJTOP}/lib/libcasper/services/cap_pwd -LIBCAP_PWD?= ${DESTDIR}${LIBDIR}/libcap_pwd.a - -LIBCAP_RANDOMDIR= ${OBJTOP}/lib/libcasper/services/cap_random -LIBCAP_RANDOM?= ${DESTDIR}${LIBDIR}/libcap_random.a - -LIBCAP_SYSCTLDIR= ${OBJTOP}/lib/libcasper/services/cap_sysctl -LIBCAP_SYSCTL?= ${DESTDIR}${LIBDIR}/libcap_sysctl.a - # Validate that listed LIBADD are valid. .for _l in ${LIBADD} .if empty(_LIBRARIES:M${_l}) |
