From 9f25e89278018f23d20882d559fdd6fefabee0f9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 17 Mar 2021 16:01:53 -0400 Subject: [PATCH] counter-config.h should be private Move it to libcounter/. Signed-off-by: Mathieu Desnoyers Change-Id: I28891c708d105c933bbe2c3cf656c7b7b6e6e550 --- include/Makefile.am | 1 - libcounter/Makefile.am | 3 ++- {include/lttng => libcounter}/counter-config.h | 0 libcounter/counter-types.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {include/lttng => libcounter}/counter-config.h (100%) diff --git a/include/Makefile.am b/include/Makefile.am index 8c741b06..9fa16492 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -32,7 +32,6 @@ nobase_include_HEADERS = \ lttng/ust-clock.h \ lttng/ust-getcpu.h \ lttng/ust-elf.h \ - lttng/counter-config.h \ lttng/ust-libc-wrapper.h \ lttng/urcu/pointer.h \ lttng/urcu/urcu-ust.h \ diff --git a/libcounter/Makefile.am b/libcounter/Makefile.am index e716b085..6407d7ad 100644 --- a/libcounter/Makefile.am +++ b/libcounter/Makefile.am @@ -7,7 +7,8 @@ noinst_LTLIBRARIES = libcounter.la libcounter_la_SOURCES = \ counter.c smp.c smp.h shm.c shm.h shm_internal.h shm_types.h \ - counter-api.h counter.h counter-internal.h counter-types.h + counter-api.h counter.h counter-internal.h counter-types.h \ + counter-config.h libcounter_la_LIBADD = \ -lpthread \ diff --git a/include/lttng/counter-config.h b/libcounter/counter-config.h similarity index 100% rename from include/lttng/counter-config.h rename to libcounter/counter-config.h diff --git a/libcounter/counter-types.h b/libcounter/counter-types.h index d57b7e10..2b71c93b 100644 --- a/libcounter/counter-types.h +++ b/libcounter/counter-types.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include "counter-config.h" #include #include "shm_types.h" -- 2.34.1