svn commit: r359292 - in head: lib/libpmc lib/libpmcstat usr.sbin/pmc usr.sbin/pmcstat

[Emmanuel Vadot]

Author: manu
Date: Wed Mar 25 01:32:16 2020
New Revision: 359292
URL: https://svnweb.freebsd.org/changeset/base/359292

Log:
  pmc: Add include path for libpmcstat as it is an internallib
  
  Reviewed by:	bapt
  Differential Revision:	https://reviews.freebsd.org/D24173

Modified:
  head/lib/libpmc/Makefile
  head/lib/libpmcstat/Makefile
  head/usr.sbin/pmc/Makefile
  head/usr.sbin/pmcstat/Makefile

Modified: head/lib/libpmc/Makefile
==============================================================================
--- head/lib/libpmc/Makefile	Wed Mar 25 01:31:26 2020	(r359291)
+++ head/lib/libpmc/Makefile	Wed Mar 25 01:32:16 2020	(r359292)
@@ -16,9 +16,10 @@ EVENT_ARCH="x86"
 EVENT_ARCH="powerpc"
 .endif
 
+CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
+
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # avoid circular dependency
-CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
 GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
 JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
 .else

Modified: head/lib/libpmcstat/Makefile
==============================================================================
--- head/lib/libpmcstat/Makefile	Wed Mar 25 01:31:26 2020	(r359291)
+++ head/lib/libpmcstat/Makefile	Wed Mar 25 01:32:16 2020	(r359292)
@@ -10,6 +10,8 @@ SRCS=	\
 	libpmcstat_process.c	\
 	libpmcstat_string.c	\
 	libpmcstat_symbol.c
-INCS=	libpmcstat.h
+
+# If libpmcstat becomes public uncomment this line
+#INCS=	libpmcstat.h
 
 .include <bsd.lib.mk>

Modified: head/usr.sbin/pmc/Makefile
==============================================================================
--- head/usr.sbin/pmc/Makefile	Wed Mar 25 01:31:26 2020	(r359291)
+++ head/usr.sbin/pmc/Makefile	Wed Mar 25 01:32:16 2020	(r359292)
@@ -9,6 +9,7 @@ WARNS?=	3
 CXXFLAGS+= -O0
 CXXSTD= c++14
 CWARNFLAGS.gcc+= -Wno-redundant-decls
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
 
 LIBADD=	kvm pmc m ncursesw pmcstat elf
 

Modified: head/usr.sbin/pmcstat/Makefile
==============================================================================
--- head/usr.sbin/pmcstat/Makefile	Wed Mar 25 01:31:26 2020	(r359291)
+++ head/usr.sbin/pmcstat/Makefile	Wed Mar 25 01:32:16 2020	(r359292)
@@ -5,6 +5,7 @@
 PROG_CXX=	pmcstat
 MAN=	pmcstat.8
 
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
 LIBADD=	kvm pmc m ncursesw pmcstat elf
 
 SRCS=	pmcstat.c pmcstat.h pmcstat_log.c \