From owner-dev-commits-src-main@freebsd.org Wed Jan 20 10:37:43 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3287B4F13A7; Wed, 20 Jan 2021 10:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DLMRW0yG6z4Wqr; Wed, 20 Jan 2021 10:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 141941785F; Wed, 20 Jan 2021 10:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10KAbgRW093407; Wed, 20 Jan 2021 10:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10KAbgGU093406; Wed, 20 Jan 2021 10:37:42 GMT (envelope-from git) Date: Wed, 20 Jan 2021 10:37:42 GMT Message-Id: <202101201037.10KAbgGU093406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: db4b5a16a30a - main - Minor simplification of MK_PMC case in usr.sbin/Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db4b5a16a30a7587fc12812d5c8a018fa7a16ded Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 10:37:43 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=db4b5a16a30a7587fc12812d5c8a018fa7a16ded commit db4b5a16a30a7587fc12812d5c8a018fa7a16ded Author: Alex Richardson AuthorDate: 2021-01-20 09:52:58 +0000 Commit: Alex Richardson CommitDate: 2021-01-20 09:52:58 +0000 Minor simplification of MK_PMC case in usr.sbin/Makefile MK_PMC is already guarded by MK_CXX in src.opts.mk, so we can actually merge it with the following SUBDIR statement after c1a3d7f20696. Suggested By: jrtc27 --- usr.sbin/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 2e01b0fcf847..da61617e408b 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -186,8 +186,7 @@ SUBDIR.${MK_NTP}+= ntp SUBDIR.${MK_OPENSSL}+= keyserv SUBDIR.${MK_PF}+= ftp-proxy SUBDIR.${MK_PKGBOOTSTRAP}+= pkg -SUBDIR.${MK_PMC}.${MK_CXX}+= pmc -SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy +SUBDIR.${MK_PMC}+= pmc pmcannotate pmccontrol pmcstat pmcstudy SUBDIR.${MK_PORTSNAP}+= portsnap SUBDIR.${MK_PPP}+= ppp SUBDIR.${MK_QUOTAS}+= edquota