Author: bdrewery
Date: Thu Mar 3 06:22:51 2016
New Revision: 296337
URL: https://svnweb.freebsd.org/changeset/base/296337
Log:
Move casper library entries to proper places.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/bsd.libnames.mk
head/share/mk/src.libnames.mk
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Thu Mar 3 05:07:35 2016
(r296336)
+++ head/share/mk/bsd.libnames.mk Thu Mar 3 06:22:51 2016
(r296337)
@@ -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
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Thu Mar 3 05:07:35 2016
(r296336)
+++ head/share/mk/src.libnames.mk Thu Mar 3 06:22:51 2016
(r296337)
@@ -488,6 +488,12 @@ LIBWINDDIR= ${OBJTOP}/kerberos5/lib/libw
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})
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
