From 69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 3 Nov 2011 12:35:30 -0400
Subject: [PATCH] library mass rename: add lttng- prefix

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 Makefile.am                                    | 10 +++++++---
 configure.ac                                   | 18 +++++++++---------
 include/lttng/ust-comm.h                       |  2 +-
 include/lttng/usterr-signal-safe.h             |  2 +-
 include/usterr.h                               |  2 +-
 {libustctl => liblttng-ust-ctl}/Makefile.am    |  7 ++++---
 {libustctl => liblttng-ust-ctl}/ustctl.c       |  0
 liblttng-ust-fork/Makefile.am                  |  9 +++++++++
 {libustfork => liblttng-ust-fork}/ustfork.c    |  0
 {libustjava => liblttng-ust-java}/.gitignore   |  0
 {libustjava => liblttng-ust-java}/Makefile.am  |  6 +++---
 {libustjava => liblttng-ust-java}/README       |  0
 {libustjava => liblttng-ust-java}/UST.c        |  0
 {libustjava => liblttng-ust-java}/UST.java     |  0
 {libustjava => liblttng-ust-java}/ust_java.h   |  0
 liblttng-ust-malloc/Makefile.am                |  9 +++++++++
 .../README                                     |  0
 .../mallocwrap.c                               |  0
 .../run                                        |  0
 {libust => liblttng-ust}/Makefile.am           | 10 +++++-----
 {libust => liblttng-ust}/ltt-context.c         |  0
 {libust => liblttng-ust}/ltt-events.c          |  0
 {libust => liblttng-ust}/ltt-probes.c          |  0
 .../ltt-ring-buffer-client-discard.c           |  0
 .../ltt-ring-buffer-client-overwrite.c         |  0
 .../ltt-ring-buffer-client.h                   |  0
 .../ltt-ring-buffer-metadata-client.c          |  0
 .../ltt-ring-buffer-metadata-client.h          |  0
 {libust => liblttng-ust}/ltt-tracer-core.h     |  0
 {libust => liblttng-ust}/ltt-tracer.h          |  0
 .../lttng-context-procname.c                   |  0
 .../lttng-context-pthread-id.c                 |  0
 {libust => liblttng-ust}/lttng-context-vpid.c  |  0
 {libust => liblttng-ust}/lttng-context-vtid.c  |  0
 {libust => liblttng-ust}/lttng-ust-abi.c       |  0
 {libust => liblttng-ust}/lttng-ust-comm.c      |  2 +-
 .../probes/lttng-probe-ust.c                   |  0
 .../probes/lttng-probe-ust.h                   |  0
 {libust => liblttng-ust}/tracepoint.c          |  0
 {libust => liblttng-ust}/ust-core.c            |  2 +-
 libustfork/Makefile.am                         |  9 ---------
 libustinstr-malloc/Makefile.am                 |  9 ---------
 tests/fork/Makefile.am                         |  6 ++++--
 tests/hello/Makefile.am                        |  4 ++--
 44 files changed, 57 insertions(+), 50 deletions(-)
 rename {libustctl => liblttng-ust-ctl}/Makefile.am (54%)
 rename {libustctl => liblttng-ust-ctl}/ustctl.c (100%)
 create mode 100644 liblttng-ust-fork/Makefile.am
 rename {libustfork => liblttng-ust-fork}/ustfork.c (100%)
 rename {libustjava => liblttng-ust-java}/.gitignore (100%)
 rename {libustjava => liblttng-ust-java}/Makefile.am (59%)
 rename {libustjava => liblttng-ust-java}/README (100%)
 rename {libustjava => liblttng-ust-java}/UST.c (100%)
 rename {libustjava => liblttng-ust-java}/UST.java (100%)
 rename {libustjava => liblttng-ust-java}/ust_java.h (100%)
 create mode 100644 liblttng-ust-malloc/Makefile.am
 rename {libustinstr-malloc => liblttng-ust-malloc}/README (100%)
 rename {libustinstr-malloc => liblttng-ust-malloc}/mallocwrap.c (100%)
 rename {libustinstr-malloc => liblttng-ust-malloc}/run (100%)
 rename {libust => liblttng-ust}/Makefile.am (76%)
 rename {libust => liblttng-ust}/ltt-context.c (100%)
 rename {libust => liblttng-ust}/ltt-events.c (100%)
 rename {libust => liblttng-ust}/ltt-probes.c (100%)
 rename {libust => liblttng-ust}/ltt-ring-buffer-client-discard.c (100%)
 rename {libust => liblttng-ust}/ltt-ring-buffer-client-overwrite.c (100%)
 rename {libust => liblttng-ust}/ltt-ring-buffer-client.h (100%)
 rename {libust => liblttng-ust}/ltt-ring-buffer-metadata-client.c (100%)
 rename {libust => liblttng-ust}/ltt-ring-buffer-metadata-client.h (100%)
 rename {libust => liblttng-ust}/ltt-tracer-core.h (100%)
 rename {libust => liblttng-ust}/ltt-tracer.h (100%)
 rename {libust => liblttng-ust}/lttng-context-procname.c (100%)
 rename {libust => liblttng-ust}/lttng-context-pthread-id.c (100%)
 rename {libust => liblttng-ust}/lttng-context-vpid.c (100%)
 rename {libust => liblttng-ust}/lttng-context-vtid.c (100%)
 rename {libust => liblttng-ust}/lttng-ust-abi.c (100%)
 rename {libust => liblttng-ust}/lttng-ust-comm.c (99%)
 rename {libust => liblttng-ust}/probes/lttng-probe-ust.c (100%)
 rename {libust => liblttng-ust}/probes/lttng-probe-ust.h (100%)
 rename {libust => liblttng-ust}/tracepoint.c (100%)
 rename {libust => liblttng-ust}/ust-core.c (96%)
 delete mode 100644 libustfork/Makefile.am
 delete mode 100644 libustinstr-malloc/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b9cc1e7d..f966498b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,14 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = . snprintf liblttng-ust-comm libringbuffer libust libustctl \
-		include doc libustjava libustfork tests
+SUBDIRS = . include doc snprintf libringbuffer liblttng-ust-comm \
+		liblttng-ust \
+		liblttng-ust-ctl \
+		liblttng-ust-fork \
+		liblttng-ust-java \
+		tests
 
 #temporarily disabled
-# . libustinstr-malloc
+# liblttng-ust-malloc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ust.pc
diff --git a/configure.ac b/configure.ac
index be93880c..88a31e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,14 +189,19 @@ AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
 
 AC_CONFIG_FILES([
 	Makefile
+	include/Makefile
+	include/lttng/version.h
 	doc/Makefile
 	doc/man/Makefile
 	doc/info/Makefile
-	include/Makefile
-	liblttng-ust-comm/Makefile
+	snprintf/Makefile
 	libringbuffer/Makefile
-	libust/Makefile
-	libustctl/Makefile
+	liblttng-ust-comm/Makefile
+	liblttng-ust/Makefile
+	liblttng-ust-ctl/Makefile
+	liblttng-ust-fork/Makefile
+	liblttng-ust-java/Makefile
+	liblttng-ust-malloc/Makefile
 	tests/Makefile
 	tests/hello/Makefile
 	tests/ust-basic-tracing/Makefile
@@ -217,11 +222,6 @@ AC_CONFIG_FILES([
 	tests/register_test/Makefile
 	tests/libustctl_function_tests/Makefile
 	tests/exit-fast/Makefile
-	libustinstr-malloc/Makefile
-	libustfork/Makefile
-	snprintf/Makefile
 	ust.pc
-	include/lttng/version.h
-	libustjava/Makefile
 ])
 AC_OUTPUT
diff --git a/include/lttng/ust-comm.h b/include/lttng/ust-comm.h
index 5fa417ee..e2a46617 100644
--- a/include/lttng/ust-comm.h
+++ b/include/lttng/ust-comm.h
@@ -33,7 +33,7 @@
 /*
  * Default timeout the application waits for the sessiond to send its
  * "register done" command. Can be overridden with the environment
- * variable "UST_REGISTER_TIMEOUT". Note that if the sessiond is not
+ * variable "LTTNG_UST_REGISTER_TIMEOUT". Note that if the sessiond is not
  * found, the application proceeds directly without any delay.
  */
 #define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
diff --git a/include/lttng/usterr-signal-safe.h b/include/lttng/usterr-signal-safe.h
index 894149a3..b8e03dbd 100644
--- a/include/lttng/usterr-signal-safe.h
+++ b/include/lttng/usterr-signal-safe.h
@@ -102,7 +102,7 @@ static inline void __attribute__ ((format (printf, 1, 2)))
 		fflush(stderr);			\
 	} while(0)
 
-#ifdef UST_DEBUG
+#ifdef LTTNG_UST_DEBUG
 # define DBG(fmt, args...)			ERRMSG(fmt, ## args)
 # define DBG_raw(fmt, args...)					\
 	do {							\
diff --git a/include/usterr.h b/include/usterr.h
index 820d4f03..fd5c80ae 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -63,7 +63,7 @@ static inline int ust_debug(void)
 			__func__);				\
 	} while(0)
 
-#ifdef UST_DEBUG
+#ifdef LTTNG_UST_DEBUG
 # define DBG(fmt, args...)		ERRMSG(fmt, ## args)
 # define DBG_raw(fmt, args...)					\
 	do {							\
diff --git a/libustctl/Makefile.am b/liblttng-ust-ctl/Makefile.am
similarity index 54%
rename from libustctl/Makefile.am
rename to liblttng-ust-ctl/Makefile.am
index 8101b573..69d747df 100644
--- a/libustctl/Makefile.am
+++ b/liblttng-ust-ctl/Makefile.am
@@ -1,10 +1,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/liblttng-ust-comm
 AM_CFLAGS = -fno-strict-aliasing
 
-lib_LTLIBRARIES = libustctl.la
+lib_LTLIBRARIES = liblttng-ust-ctl.la
 
-libustctl_la_SOURCES = ustctl.c
+liblttng_ust_ctl_la_SOURCES = ustctl.c
 
-libustctl_la_LIBADD = $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
+liblttng_ust_ctl_la_LIBADD = \
+	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	$(top_builddir)/libringbuffer/libringbuffer.la \
 	$(top_builddir)/snprintf/libustsnprintf.la
diff --git a/libustctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
similarity index 100%
rename from libustctl/ustctl.c
rename to liblttng-ust-ctl/ustctl.c
diff --git a/liblttng-ust-fork/Makefile.am b/liblttng-ust-fork/Makefile.am
new file mode 100644
index 00000000..e0e42a3f
--- /dev/null
+++ b/liblttng-ust-fork/Makefile.am
@@ -0,0 +1,9 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -fno-strict-aliasing
+
+lib_LTLIBRARIES = liblttng-ust-fork.la
+liblttng_ust_fork_la_SOURCES = ustfork.c
+liblttng_ust_fork_la_LIBADD = \
+	-ldl \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la
+libustfork_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork -fno-strict-aliasing
diff --git a/libustfork/ustfork.c b/liblttng-ust-fork/ustfork.c
similarity index 100%
rename from libustfork/ustfork.c
rename to liblttng-ust-fork/ustfork.c
diff --git a/libustjava/.gitignore b/liblttng-ust-java/.gitignore
similarity index 100%
rename from libustjava/.gitignore
rename to liblttng-ust-java/.gitignore
diff --git a/libustjava/Makefile.am b/liblttng-ust-java/Makefile.am
similarity index 59%
rename from libustjava/Makefile.am
rename to liblttng-ust-java/Makefile.am
index cb2c1b89..fb25cb7b 100644
--- a/libustjava/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -2,10 +2,10 @@ if BUILD_JNI_INTERFACE
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = libustjava.la
-libustjava_la_SOURCES = UST.c UST.h ust_java.h
+lib_LTLIBRARIES = liblttng-ust-java.la
+liblttng_ust_java_la_SOURCES = UST.c UST.h ust_java.h
 dist_noinst_DATA = UST.java
-libustjava_la_LIBADD = -lc -L$(top_builddir)/libust/.libs -lust
+liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
 all: UST.class UST.h
 
diff --git a/libustjava/README b/liblttng-ust-java/README
similarity index 100%
rename from libustjava/README
rename to liblttng-ust-java/README
diff --git a/libustjava/UST.c b/liblttng-ust-java/UST.c
similarity index 100%
rename from libustjava/UST.c
rename to liblttng-ust-java/UST.c
diff --git a/libustjava/UST.java b/liblttng-ust-java/UST.java
similarity index 100%
rename from libustjava/UST.java
rename to liblttng-ust-java/UST.java
diff --git a/libustjava/ust_java.h b/liblttng-ust-java/ust_java.h
similarity index 100%
rename from libustjava/ust_java.h
rename to liblttng-ust-java/ust_java.h
diff --git a/liblttng-ust-malloc/Makefile.am b/liblttng-ust-malloc/Makefile.am
new file mode 100644
index 00000000..eb2ea753
--- /dev/null
+++ b/liblttng-ust-malloc/Makefile.am
@@ -0,0 +1,9 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -fno-strict-aliasing
+
+lib_LTLIBRARIES = liblttng-ust-malloc.la
+liblttng_ust_malloc_la_SOURCES = mallocwrap.c
+liblttng_ust_malloc_la_LIBADD = -ldl
+
+noinst_SCRIPTS = run
+EXTRA_DIST = run
diff --git a/libustinstr-malloc/README b/liblttng-ust-malloc/README
similarity index 100%
rename from libustinstr-malloc/README
rename to liblttng-ust-malloc/README
diff --git a/libustinstr-malloc/mallocwrap.c b/liblttng-ust-malloc/mallocwrap.c
similarity index 100%
rename from libustinstr-malloc/mallocwrap.c
rename to liblttng-ust-malloc/mallocwrap.c
diff --git a/libustinstr-malloc/run b/liblttng-ust-malloc/run
similarity index 100%
rename from libustinstr-malloc/run
rename to liblttng-ust-malloc/run
diff --git a/libust/Makefile.am b/liblttng-ust/Makefile.am
similarity index 76%
rename from libust/Makefile.am
rename to liblttng-ust/Makefile.am
index 9295d6b7..19d7482a 100644
--- a/libust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
-lib_LTLIBRARIES = libust.la
+lib_LTLIBRARIES = liblttng-ust.la
 
-libust_la_SOURCES = \
+liblttng_ust_la_SOURCES = \
 	tracepoint.c \
 	ltt-tracer.h \
 	ltt-tracer-core.h \
@@ -25,9 +25,9 @@ libust_la_SOURCES = \
 	lttng-context-procname.c \
 	ltt-context.c
 
-libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
+liblttng_ust_la_LDFLAGS = -no-undefined -version-info 0:0:0
 
-libust_la_LIBADD = \
+liblttng_ust_la_LIBADD = \
 	-lpthread \
 	-lrt \
 	-luuid \
@@ -35,4 +35,4 @@ libust_la_LIBADD = \
 	$(top_builddir)/libringbuffer/libringbuffer.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la
 
-libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing
+liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng-ust" -fno-strict-aliasing
diff --git a/libust/ltt-context.c b/liblttng-ust/ltt-context.c
similarity index 100%
rename from libust/ltt-context.c
rename to liblttng-ust/ltt-context.c
diff --git a/libust/ltt-events.c b/liblttng-ust/ltt-events.c
similarity index 100%
rename from libust/ltt-events.c
rename to liblttng-ust/ltt-events.c
diff --git a/libust/ltt-probes.c b/liblttng-ust/ltt-probes.c
similarity index 100%
rename from libust/ltt-probes.c
rename to liblttng-ust/ltt-probes.c
diff --git a/libust/ltt-ring-buffer-client-discard.c b/liblttng-ust/ltt-ring-buffer-client-discard.c
similarity index 100%
rename from libust/ltt-ring-buffer-client-discard.c
rename to liblttng-ust/ltt-ring-buffer-client-discard.c
diff --git a/libust/ltt-ring-buffer-client-overwrite.c b/liblttng-ust/ltt-ring-buffer-client-overwrite.c
similarity index 100%
rename from libust/ltt-ring-buffer-client-overwrite.c
rename to liblttng-ust/ltt-ring-buffer-client-overwrite.c
diff --git a/libust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h
similarity index 100%
rename from libust/ltt-ring-buffer-client.h
rename to liblttng-ust/ltt-ring-buffer-client.h
diff --git a/libust/ltt-ring-buffer-metadata-client.c b/liblttng-ust/ltt-ring-buffer-metadata-client.c
similarity index 100%
rename from libust/ltt-ring-buffer-metadata-client.c
rename to liblttng-ust/ltt-ring-buffer-metadata-client.c
diff --git a/libust/ltt-ring-buffer-metadata-client.h b/liblttng-ust/ltt-ring-buffer-metadata-client.h
similarity index 100%
rename from libust/ltt-ring-buffer-metadata-client.h
rename to liblttng-ust/ltt-ring-buffer-metadata-client.h
diff --git a/libust/ltt-tracer-core.h b/liblttng-ust/ltt-tracer-core.h
similarity index 100%
rename from libust/ltt-tracer-core.h
rename to liblttng-ust/ltt-tracer-core.h
diff --git a/libust/ltt-tracer.h b/liblttng-ust/ltt-tracer.h
similarity index 100%
rename from libust/ltt-tracer.h
rename to liblttng-ust/ltt-tracer.h
diff --git a/libust/lttng-context-procname.c b/liblttng-ust/lttng-context-procname.c
similarity index 100%
rename from libust/lttng-context-procname.c
rename to liblttng-ust/lttng-context-procname.c
diff --git a/libust/lttng-context-pthread-id.c b/liblttng-ust/lttng-context-pthread-id.c
similarity index 100%
rename from libust/lttng-context-pthread-id.c
rename to liblttng-ust/lttng-context-pthread-id.c
diff --git a/libust/lttng-context-vpid.c b/liblttng-ust/lttng-context-vpid.c
similarity index 100%
rename from libust/lttng-context-vpid.c
rename to liblttng-ust/lttng-context-vpid.c
diff --git a/libust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
similarity index 100%
rename from libust/lttng-context-vtid.c
rename to liblttng-ust/lttng-context-vtid.c
diff --git a/libust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
similarity index 100%
rename from libust/lttng-ust-abi.c
rename to liblttng-ust/lttng-ust-abi.c
diff --git a/libust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
similarity index 99%
rename from libust/lttng-ust-comm.c
rename to liblttng-ust/lttng-ust-comm.c
index 1246c654..d35511b2 100644
--- a/libust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -712,7 +712,7 @@ int get_timeout(struct timespec *constructor_timeout)
 	char *str_delay;
 	int ret;
 
-	str_delay = getenv("UST_REGISTER_TIMEOUT");
+	str_delay = getenv("LTTNG_UST_REGISTER_TIMEOUT");
 	if (str_delay) {
 		constructor_delay_ms = strtol(str_delay, NULL, 10);
 	}
diff --git a/libust/probes/lttng-probe-ust.c b/liblttng-ust/probes/lttng-probe-ust.c
similarity index 100%
rename from libust/probes/lttng-probe-ust.c
rename to liblttng-ust/probes/lttng-probe-ust.c
diff --git a/libust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h
similarity index 100%
rename from libust/probes/lttng-probe-ust.h
rename to liblttng-ust/probes/lttng-probe-ust.h
diff --git a/libust/tracepoint.c b/liblttng-ust/tracepoint.c
similarity index 100%
rename from libust/tracepoint.c
rename to liblttng-ust/tracepoint.c
diff --git a/libust/ust-core.c b/liblttng-ust/ust-core.c
similarity index 96%
rename from libust/ust-core.c
rename to liblttng-ust/ust-core.c
index b5cc8cf8..404e0b26 100644
--- a/libust/ust-core.c
+++ b/liblttng-ust/ust-core.c
@@ -28,7 +28,7 @@ void init_usterr(void)
 	char *ust_debug;
 
 	if (ust_loglevel == UST_LOGLEVEL_UNKNOWN) {
-		ust_debug = getenv("UST_DEBUG");
+		ust_debug = getenv("LTTNG_UST_DEBUG");
 		if (ust_debug)
 			ust_loglevel = UST_LOGLEVEL_DEBUG;
 		else
diff --git a/libustfork/Makefile.am b/libustfork/Makefile.am
deleted file mode 100644
index f2a9996e..00000000
--- a/libustfork/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
-
-lib_LTLIBRARIES = libustfork.la
-libustfork_la_SOURCES = ustfork.c
-libustfork_la_LIBADD = \
-	-ldl \
-	$(top_builddir)/libust/libust.la
-libustfork_CFLAGS = -DUST_COMPONENT=libustfork -fno-strict-aliasing
diff --git a/libustinstr-malloc/Makefile.am b/libustinstr-malloc/Makefile.am
deleted file mode 100644
index 26c73e0a..00000000
--- a/libustinstr-malloc/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = -fno-strict-aliasing
-
-lib_LTLIBRARIES = libustinstr-malloc.la
-libustinstr_malloc_la_SOURCES = mallocwrap.c
-libustinstr_malloc_la_LIBADD = -ldl
-
-noinst_SCRIPTS = run
-EXTRA_DIST = run
diff --git a/tests/fork/Makefile.am b/tests/fork/Makefile.am
index 1898f219..29464f41 100644
--- a/tests/fork/Makefile.am
+++ b/tests/fork/Makefile.am
@@ -2,9 +2,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = fork fork2
 fork_SOURCES = fork.c ust_tests_fork.h
-fork_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libustfork/libustfork.la
+fork_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \
+		$(top_builddir)/liblttng-ust-fork/liblttng-ust-fork.la
 fork2_SOURCES = fork2.c
-fork2_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libustfork/libustfork.la
+fork2_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \
+		$(top_builddir)/liblttng-ust-fork/liblttng-ust-fork.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run
diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index 8447e24a..9afe3874 100644
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -1,8 +1,8 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libust
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c tp.h
-hello_LDADD = $(top_builddir)/libust/libust.la
+hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
 
 noinst_SCRIPTS = run
 EXTRA_DIST = run
-- 
2.34.1