-test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE)
-
-# Session unit test
-SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.$(OBJEXT) \
+test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS)
+
+# Sessiond objects
+SESSIOND_OBJS = $(top_builddir)/src/bin/lttng-sessiond/buffer-registry.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/cmd.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/save.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/notification-thread-commands.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/shm.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/kernel.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/ht-cleanup.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/notification-thread.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/lttng-syscall.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/channel.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/agent.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/kernel-consumer.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/trace-kernel.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/rotation-thread.$(OBJEXT) \
+ $(top_builddir)/src/bin/lttng-sessiond/context.$(OBJEXT) \