From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 26 12:54:59 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7424CBBE;
 Wed, 26 Nov 2014 12:54:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 60EA03E8;
 Wed, 26 Nov 2014 12:54:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQCsxAa032501;
 Wed, 26 Nov 2014 12:54:59 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQCswKi032495;
 Wed, 26 Nov 2014 12:54:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411261254.sAQCswKi032495@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 26 Nov 2014 12:54:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275115 - in projects/building-blocks: include/protocols
 tools/build/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2014 12:54:59 -0000

Author: ngie
Date: Wed Nov 26 12:54:58 2014
New Revision: 275115
URL: https://svnweb.freebsd.org/changeset/base/275115

Log:
  Account for /usr/include/protocols/r{outed,whod}.h with their respective build knobs

Modified:
  projects/building-blocks/include/protocols/Makefile
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc

Modified: projects/building-blocks/include/protocols/Makefile
==============================================================================
--- projects/building-blocks/include/protocols/Makefile	Wed Nov 26 12:49:37 2014	(r275114)
+++ projects/building-blocks/include/protocols/Makefile	Wed Nov 26 12:54:58 2014	(r275115)
@@ -3,9 +3,17 @@
 .include <src.opts.mk>
 
 NO_OBJ=
-INCS=	dumprestore.h routed.h rwhod.h timed.h
+INCS=	dumprestore.h timed.h
 INCSDIR=${INCLUDEDIR}/protocols
 
+.if ${MK_RCMDS} != "no"
+INCS+=	rwhod.h
+.endif
+
+.if ${MK_ROUTED} != "no"
+INCS+=	routed.h
+.endif
+
 .if ${MK_TALK} != "no"
 INCS+=	talkd.h
 .endif

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 12:49:37 2014	(r275114)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Wed Nov 26 12:54:58 2014	(r275115)
@@ -3985,6 +3985,7 @@ OLD_FILES+=usr/share/man/man8/rbootd.8.g
 .endif
 
 .if ${MK_RCMDS} == no
+OLD_FILES+=usr/include/protocols/rwhod.h
 OLD_FILES+=bin/rcp
 OLD_FILES+=etc/pam.d/rsh
 OLD_FILES+=etc/rc.d/rwho
@@ -4040,6 +4041,7 @@ OLD_FILES+=usr/share/man/man8/etcupdate.
 #.endif
 
 .if ${MK_ROUTED} == no
+OLD_FILES+=usr/include/protocols/routed.h
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz