svn commit: r275115 - in projects/building-blocks: include/protocols tools/build/mk

[Garrett Cooper]

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