Author: kevans
Date: Thu Nov 8 03:24:24 2018
New Revision: 340243
URL: https://svnweb.freebsd.org/changeset/base/340243
Log:
MFC r340146: Move pmc* bits behind MK_PMC to fix WITHOUT_PMC build
Approved by: re (rgrimes)
Modified:
stable/12/lib/Makefile
stable/12/usr.sbin/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/Makefile
==============================================================================
--- stable/12/lib/Makefile Thu Nov 8 00:35:00 2018 (r340242)
+++ stable/12/lib/Makefile Thu Nov 8 03:24:24 2018 (r340243)
@@ -70,8 +70,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libpathconv \
libpcap \
libpjdlog \
- libpmc \
- libpmcstat \
${_libproc} \
libprocstat \
libregex \
@@ -200,6 +198,7 @@ _libdl= libdl
.endif
SUBDIR.${MK_OPENSSL}+= libmp
+SUBDIR.${MK_PMC}+= libpmc libpmcstat
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
Modified: stable/12/usr.sbin/Makefile
==============================================================================
--- stable/12/usr.sbin/Makefile Thu Nov 8 00:35:00 2018 (r340242)
+++ stable/12/usr.sbin/Makefile Thu Nov 8 03:24:24 2018 (r340243)
@@ -59,9 +59,6 @@ SUBDIR= adduser \
nologin \
pciconf \
periodic \
- pmcannotate \
- pmccontrol \
- pmcstat \
pnfsdscopymr \
pnfsdsfile \
pnfsdskill \
@@ -191,7 +188,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+= pkg
.if ${COMPILER_FEATURES:Mc++11}
SUBDIR.${MK_PMC}+= pmc
.endif
-SUBDIR.${MK_PMC}+= pmcstudy
+SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy
SUBDIR.${MK_PORTSNAP}+= portsnap
SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
