svn commit: r322698 - projects/runtime-coverage/share/mk

[Ngie Cooper]

Author: ngie
Date: Sat Aug 19 18:31:00 2017
New Revision: 322698
URL: https://svnweb.freebsd.org/changeset/base/322698

Log:
  Complete bsd.cov.mk integration
  
  Pass through appropriate objects via COV_OBJS in bsd.lib.mk (based on
  SOBJS), and appropriate objects via bsd.prog.mk (OBJS).
  
  While here, do more intelligent things in terms of iterating over COV_OBJS,
  building lists of items to install with the GCNOS variable/adding GCNOS to
  FILESGROUPS, etc. This reduces the 2 unrolled .for loops into 1.

Modified:
  projects/runtime-coverage/share/mk/bsd.cov.mk
  projects/runtime-coverage/share/mk/bsd.lib.mk
  projects/runtime-coverage/share/mk/bsd.prog.mk

Modified: projects/runtime-coverage/share/mk/bsd.cov.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.cov.mk	Sat Aug 19 17:18:27 2017	(r322697)
+++ projects/runtime-coverage/share/mk/bsd.cov.mk	Sat Aug 19 18:31:00 2017	(r322698)
@@ -1,31 +1,22 @@
 # $FreeBSD$
 
-.ifdef notyet
 .include <bsd.own.mk>
 
 FILESGROUPS?=	FILES
-_GCNOGROUPS=
 
-.for _obj in ${OBJS}
-# XXX (ngie): this is pretty hamfisted
-.if !empty(SRCS:T:M${obj:.o=.asm}) || !empty(SRCS:T:M${obj:.o=.s})
-_gcno=		${_obj:.o=.gcno}
-_gcno_prefix=	${_gcno:H:tA}
-_gcno_dir=	${COVERAGEDIR}${_gcno_prefix}
+GCNOS=		${COV_OBJS:.o=.gcno}
 
-_GCNO_GROUPS+=	${_gcno_prefix}
-CLEANFILES+=	${_gcno}
-${_gcno_prefix}+=	${_gcno}
-${_gcno_prefix}DIR=	${_gcno_dir}
-${_gcno}: ${_obj}
-.endif
-.endfor
+.if !empty(GCNOS)
+FILESGROUPS+=	GCNOS
+CLEANFILES+=	${GCNOS}
 
-_GCNO_GROUPS:=	${_GCNO_GROUPS:O:u}
-FILESGROUPS+=	${_GCNO_GROUPS}
-.for _gcno_group in ${_GCNO_GROUPS}
-beforeinstall: ${DESTDIR}${${_gcno_group}DIR}
-${DESTDIR}${${_gcno_group}DIR}:
+.for _gcno in ${GCNOS}
+_gcno_dir=	${COVERAGEDIR}${_gcno:H:tA}
+GCNOS_${_gcno:T}DIR=	${_gcno_dir}
+.if !target(${DESTDIR}${_gcno_dir})
+beforeinstall: ${DESTDIR}${_gcno_dir}
+${DESTDIR}${_gcno_dir}:
 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${.TARGET}
+.endif
 .endfor
 .endif

Modified: projects/runtime-coverage/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.lib.mk	Sat Aug 19 17:18:27 2017	(r322697)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Sat Aug 19 18:31:00 2017	(r322698)
@@ -453,6 +453,7 @@ _libinstall:
 .if !defined(LIBRARIES_ONLY)
 .include <bsd.nls.mk>
 .if defined(_COV_FLAG)
+COV_OBJS=	${SOBJS}
 .include <bsd.cov.mk>
 .endif
 .include <bsd.files.mk>

Modified: projects/runtime-coverage/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.prog.mk	Sat Aug 19 17:18:27 2017	(r322697)
+++ projects/runtime-coverage/share/mk/bsd.prog.mk	Sat Aug 19 18:31:00 2017	(r322698)
@@ -302,6 +302,7 @@ NLSNAME?=	${PROG}
 
 .include <bsd.confs.mk>
 .if defined(_COV_FLAG)
+COV_OBJS=	${OBJS}
 .include <bsd.cov.mk>
 .endif
 .include <bsd.files.mk>