d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move pmc* bits behind MK_PMC to fix WITHOUT_PMC build

Browse Source 
No objection from:	mmacy
MFC after:	3 days
This commit is contained in:
kevans 2018-11-05 00:20:58 +00:00
parent b6fca3ee80
commit bad0064ce6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile
View File

@ -70,8 +70,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libpathconv \ libpathconv \
libpcap \ libpcap \
libpjdlog \ libpjdlog \
libpmc \
libpmcstat \
${_libproc} \ ${_libproc} \
libprocstat \ libprocstat \
libregex \ libregex \
@ -200,6 +198,7 @@ _libdl= libdl
.endif .endif
SUBDIR.${MK_OPENSSL}+= libmp SUBDIR.${MK_OPENSSL}+= libmp
SUBDIR.${MK_PMC}+= libpmc libpmcstat
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet SUBDIR.${MK_TELNET}+= libtelnet

5
usr.sbin/Makefile
View File

@ -59,9 +59,6 @@ SUBDIR= adduser \
nologin \ nologin \
pciconf \ pciconf \
periodic \ periodic \
pmcannotate \
pmccontrol \
pmcstat \
pnfsdscopymr \ pnfsdscopymr \
pnfsdsfile \ pnfsdsfile \
pnfsdskill \ pnfsdskill \
@ -191,7 +188,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+= pkg
.if ${COMPILER_FEATURES:Mc++11} .if ${COMPILER_FEATURES:Mc++11}
SUBDIR.${MK_PMC}+= pmc SUBDIR.${MK_PMC}+= pmc
.endif .endif
SUBDIR.${MK_PMC}+= pmcstudy SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy
SUBDIR.${MK_PORTSNAP}+= portsnap SUBDIR.${MK_PORTSNAP}+= portsnap
SUBDIR.${MK_PPP}+= ppp SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota SUBDIR.${MK_QUOTAS}+= edquota