liblttng-ust-fd doesn't use the internal logging system

liblttng-ust-fd is a standalone library that only uses liblttng-ust
public symbols and doesn't currently use the internal logging system. We
don't need to link against the private convenience library and
initialize the logging system, clean this up.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ifd111722e4034de70f68adc3c84b466e3d490370

diff --git a/liblttng-ust-fd/Makefile.am b/liblttng-ust-fd/Makefile.am
index b9242d8fdd7c5d5fd877f9b721acb2aeb9c14c80..99e27bd91e3a3651793860af3d05564ce6c6b856 100644 (file)
--- a/liblttng-ust-fd/Makefile.am
+++ b/liblttng-ust-fd/Makefile.am
@@ -8,9 +8,6 @@ liblttng_ust_fd_la_SOURCES = \
 
 liblttng_ust_fd_la_LIBADD = \
        $(top_builddir)/liblttng-ust/liblttng-ust.la \
-       $(top_builddir)/snprintf/libustsnprintf.la \
        $(DL_LIBS)
 
-liblttng_ust_fd_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fd $(AM_CFLAGS)
-
 liblttng_ust_fd_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION)

diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
index 607df41eabfb9c8ca21069b0f11f7cd63c4dda89..14a23d9f557b79f12d44146d52a498b895ac76dd 100644 (file)
--- a/liblttng-ust-fd/lttng-ust-fd.c
+++ b/liblttng-ust-fd/lttng-ust-fd.c
@@ -13,17 +13,10 @@
 #include <dlfcn.h>
 
 #include <ust-helper.h>
-#include "usterr-signal-safe.h"
 
 static int (*__lttng_ust_fd_plibc_close)(int fd);
 static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
 
-static __attribute__((constructor))
-void _lttng_ust_fd_init(void)
-{
-       ust_err_init();
-}
-
 static
 int _lttng_ust_fd_libc_close(int fd)
 {