From bad0064ce6798ecf1baa96cc20cfe3eaa8112f46 Mon Sep 17 00:00:00 2001 From: kevans Date: Mon, 5 Nov 2018 00:20:58 +0000 Subject: [PATCH] Move pmc* bits behind MK_PMC to fix WITHOUT_PMC build No objection from: mmacy MFC after: 3 days --- lib/Makefile | 3 +-- usr.sbin/Makefile | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 4332aa13a70c..58c3753ec8e5 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -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 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 25e3265b6992..3c371d404fcf 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -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