This allows correctly linking test_kernel_data with slibtool.
Signed-off-by: orbea <orbea@riseup.net>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ib076854dc2a4f0234ad3fb04ea1c3c7c4d4a2b7e
AM_CPPFLAGS += -I$(top_builddir)/doc/man
endif
AM_CPPFLAGS += -I$(top_builddir)/doc/man
endif
-bin_PROGRAMS = lttng-sessiond
+noinst_LTLIBRARIES = liblttng-sessiond-common.la
-lttng_sessiond_SOURCES = utils.c utils.h \
+liblttng_sessiond_common_la_SOURCES = utils.c utils.h \
trace-kernel.c trace-kernel.h \
kernel.c kernel.h \
ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \
trace-kernel.c trace-kernel.h \
kernel.c kernel.h \
ust-app.h ust-sigbus.h trace-ust.h notify-apps.h \
action-executor.c action-executor.h\
trigger-error-query.c
action-executor.c action-executor.h\
trigger-error-query.c
-lttng_sessiond_LDFLAGS = -rdynamic
-
-lttng_sessiond_SOURCES += trace-ust.c ust-registry.c ust-app.c \
+liblttng_sessiond_common_la_SOURCES += trace-ust.c ust-registry.c ust-app.c \
ust-consumer.c ust-consumer.h notify-apps.c \
ust-metadata.c ust-clock.h agent-thread.c agent-thread.h \
ust-field-utils.h ust-field-utils.c \
ust-sigbus.c
endif
ust-consumer.c ust-consumer.h notify-apps.c \
ust-metadata.c ust-clock.h agent-thread.c agent-thread.h \
ust-field-utils.h ust-field-utils.c \
ust-sigbus.c
endif
-# Add main.c at the end for compile order
-lttng_sessiond_SOURCES += lttng-sessiond.h main.c
-
# link on liblttngctl for check if sessiond is already alive.
# link on liblttngctl for check if sessiond is already alive.
-lttng_sessiond_LDADD = -lurcu-common $(URCU_LIBS) $(KMOD_LIBS) \
+liblttng_sessiond_common_la_LIBADD = $(URCU_LIBS) $(KMOD_LIBS) \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \
$(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \
-lttng_sessiond_LDADD += $(UST_CTL_LIBS)
+liblttng_sessiond_common_la_LIBADD += $(UST_CTL_LIBS)
+
+bin_PROGRAMS = lttng-sessiond
+
+lttng_sessiond_SOURCES = lttng-sessiond.h main.c
+
+lttng_sessiond_LDFLAGS = -rdynamic
+
+lttng_sessiond_LDADD = liblttng-sessiond-common.la
LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la
LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la
+LIBLTTNG_SESSIOND_COMMON=$(top_builddir)/src/bin/lttng-sessiond/liblttng-sessiond-common.la
# Define test programs
noinst_PROGRAMS = \
# Define test programs
noinst_PROGRAMS = \
test_ust_data_LDADD += $(SESSIOND_OBJS)
endif
test_ust_data_LDADD += $(SESSIOND_OBJS)
endif
-# Kernel data structures unit test
-KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
- $(top_builddir)/src/common/compat/libcompat.la \
- $(top_builddir)/src/bin/lttng-sessiond/consumer.$(OBJEXT) \
- $(top_builddir)/src/bin/lttng-sessiond/globals.$(OBJEXT) \
- $(top_builddir)/src/bin/lttng-sessiond/utils.$(OBJEXT) \
- $(top_builddir)/src/bin/lttng-sessiond/tracker.$(OBJEXT) \
- $(top_builddir)/src/common/health/libhealth.la \
- $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
- $(LIBLTTNG_CTL)
-
test_kernel_data_SOURCES = test_kernel_data.c
test_kernel_data_SOURCES = test_kernel_data.c
-test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) \
- $(LIBHASHTABLE) $(DL_LIBS) -lrt
-test_kernel_data_LDADD += $(KERN_DATA_TRACE)
+test_kernel_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS)
# utils suffix for unit test
# utils suffix for unit test
/* Number of TAP tests in this file */
#define NUM_TESTS 11
/* Number of TAP tests in this file */
#define NUM_TESTS 11
-/* For error.h */
-int lttng_opt_quiet = 1;
-int lttng_opt_verbose;
-int lttng_opt_mi;
-
static const char alphanum[] =
"0123456789"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
static const char alphanum[] =
"0123456789"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"