From 394598c1632131141b04ae80cb5e0d40004b95f0 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 28 Nov 2013 16:38:52 +0100 Subject: [PATCH] Compile liblttng-ust-baddr c files into liblttng-ust Move them into liblttng-ust/, where they are now compiled. This is to ensure we don't rely on statically linked libs (and associated constructor problems), and that we don't install a shared object in the system needlessly. Signed-off-by: Mathieu Desnoyers --- Makefile.am | 2 +- configure.ac | 1 - liblttng-ust-baddr/Makefile.am | 9 --------- liblttng-ust/Makefile.am | 5 ++++- {liblttng-ust-baddr => liblttng-ust}/lttng-ust-baddr.c | 0 {liblttng-ust-baddr => liblttng-ust}/lttng-ust-baddr.h | 0 liblttng-ust/lttng-ust-comm.c | 2 +- .../ust_baddr_statedump.c | 0 .../ust_baddr_statedump.h | 0 9 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 liblttng-ust-baddr/Makefile.am rename {liblttng-ust-baddr => liblttng-ust}/lttng-ust-baddr.c (100%) rename {liblttng-ust-baddr => liblttng-ust}/lttng-ust-baddr.h (100%) rename {liblttng-ust-baddr => liblttng-ust}/ust_baddr_statedump.c (100%) rename {liblttng-ust-baddr => liblttng-ust}/ust_baddr_statedump.h (100%) diff --git a/Makefile.am b/Makefile.am index 6fab9564..b79d2dd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I config -SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm liblttng-ust-baddr \ +SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ liblttng-ust \ liblttng-ust-ctl \ liblttng-ust-fork \ diff --git a/configure.ac b/configure.ac index 60460da5..72a03140 100644 --- a/configure.ac +++ b/configure.ac @@ -288,7 +288,6 @@ AC_CONFIG_FILES([ liblttng-ust/Makefile liblttng-ust-ctl/Makefile liblttng-ust-fork/Makefile - liblttng-ust-baddr/Makefile liblttng-ust-dl/Makefile liblttng-ust-java/Makefile liblttng-ust-jul/Makefile diff --git a/liblttng-ust-baddr/Makefile.am b/liblttng-ust-baddr/Makefile.am deleted file mode 100644 index cdbc0c1e..00000000 --- a/liblttng-ust-baddr/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -fno-strict-aliasing - -noinst_LTLIBRARIES = liblttng-ust-baddr.la - -liblttng_ust_baddr_la_SOURCES = \ - lttng-ust-baddr.c \ - ust_baddr_statedump.c \ - ust_baddr_statedump.h diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am index f00fe45f..b165c321 100644 --- a/liblttng-ust/Makefile.am +++ b/liblttng-ust/Makefile.am @@ -35,6 +35,10 @@ liblttng_ust_runtime_la_SOURCES = \ lttng-filter-interpreter.c \ filter-bytecode.h \ lttng-hash-helper.h \ + lttng-ust-baddr.c \ + lttng-ust-baddr.h \ + ust_baddr_statedump.c \ + ust_baddr_statedump.h \ tracepoint-internal.h \ clock.h \ compat.h \ @@ -69,7 +73,6 @@ liblttng_ust_la_LIBADD = \ -lurcu-cds \ $(top_builddir)/snprintf/libustsnprintf.la \ $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ - $(top_builddir)/liblttng-ust-baddr/liblttng-ust-baddr.la \ liblttng-ust-tracepoint.la \ liblttng-ust-runtime.la liblttng-ust-support.la diff --git a/liblttng-ust-baddr/lttng-ust-baddr.c b/liblttng-ust/lttng-ust-baddr.c similarity index 100% rename from liblttng-ust-baddr/lttng-ust-baddr.c rename to liblttng-ust/lttng-ust-baddr.c diff --git a/liblttng-ust-baddr/lttng-ust-baddr.h b/liblttng-ust/lttng-ust-baddr.h similarity index 100% rename from liblttng-ust-baddr/lttng-ust-baddr.h rename to liblttng-ust/lttng-ust-baddr.h diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index 2d3766f1..b99bf00e 100644 --- a/liblttng-ust/lttng-ust-comm.c +++ b/liblttng-ust/lttng-ust-comm.c @@ -52,7 +52,7 @@ #include "lttng-tracer-core.h" #include "compat.h" #include "../libringbuffer/tlsfixup.h" -#include "../liblttng-ust-baddr/lttng-ust-baddr.h" +#include "lttng-ust-baddr.h" /* * Has lttng ust comm constructor been called ? diff --git a/liblttng-ust-baddr/ust_baddr_statedump.c b/liblttng-ust/ust_baddr_statedump.c similarity index 100% rename from liblttng-ust-baddr/ust_baddr_statedump.c rename to liblttng-ust/ust_baddr_statedump.c diff --git a/liblttng-ust-baddr/ust_baddr_statedump.h b/liblttng-ust/ust_baddr_statedump.h similarity index 100% rename from liblttng-ust-baddr/ust_baddr_statedump.h rename to liblttng-ust/ust_baddr_statedump.h -- 2.34.1