X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2FMakefile.am;h=424afd1c5776a8cc89bec902d701f6ecf66c0a9e;hb=411b31544f22b773b4aad6cdb81faa81dc05e641;hp=c70bc53a2eccaed40aebc4d5b87b19cc269dc247;hpb=343af227102f6b274bfd7f6c7220eb3b776ba5e3;p=lttng-tools.git

diff --git a/tests/regression/ust/linking/Makefile.am b/tests/regression/ust/linking/Makefile.am
index c70bc53a2..424afd1c5 100644
--- a/tests/regression/ust/linking/Makefile.am
+++ b/tests/regression/ust/linking/Makefile.am
@@ -1,6 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 # -Wsystem-headers is needed to print warnings in the tracepoint
 # description file.
-AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers
+#
+# However, we see some -Wformat-nonliteral warnings in some system headers,
+# so disable that.
+AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers -Wno-format-nonliteral
 
 # Set LIBS to nothing so the application does not link on useless
 # libraries.
@@ -9,7 +14,7 @@ LIBS =
 # Build a version of the test app with built-in tracepoints
 demo_builtin_SOURCES = demo.c tp.c tp2.c tp3.c ust_tests_demo.h \
 	ust_tests_demo2.h ust_tests_demo3.h
-demo_builtin_LDADD = -llttng-ust
+demo_builtin_LDADD = $(UST_LIBS) $(DL_LIBS)
 demo_builtin_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
 
 # Build a version statically linked to the providers
@@ -21,26 +26,18 @@ liblttng_ust_provider_ust_tests_demo_static_la_SOURCES = \
 	tp.c ust_tests_demo.h \
 	tp2.c ust_tests_demo2.h
 liblttng_ust_provider_ust_tests_demo_static_la_LIBADD = \
-	-llttng-ust
+	$(UST_LIBS)
 
 # contains ust_tests_demo3.h provider probes
 liblttng_ust_provider_ust_tests_demo3_static_la_SOURCES = \
 	tp3.c ust_tests_demo3.h
 liblttng_ust_provider_ust_tests_demo3_static_la_LIBADD = \
-	-llttng-ust
+	$(UST_LIBS)
 
 demo_static_SOURCES = demo.c
 demo_static_LDADD = liblttng-ust-provider-ust-tests-demo-static.la \
-	liblttng-ust-provider-ust-tests-demo3-static.la
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-demo_builtin_LDADD += -ldl
-demo_static_LDADD += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-demo_builtin_LDADD += -lc
-demo_static_LDADD += -lc
-endif
+	liblttng-ust-provider-ust-tests-demo3-static.la \
+	$(DL_LIBS)
 
 noinst_PROGRAMS = demo_builtin demo_static
 
@@ -66,27 +63,21 @@ noinst_LTLIBRARIES += liblttng-ust-provider-ust-tests-demo.la \
 liblttng_ust_provider_ust_tests_demo_la_SOURCES = \
 	tp.c ust_tests_demo.h \
 	tp2.c ust_tests_demo2.h
-liblttng_ust_provider_ust_tests_demo_la_LIBADD = -llttng-ust
+liblttng_ust_provider_ust_tests_demo_la_LIBADD = $(UST_LIBS)
 liblttng_ust_provider_ust_tests_demo_la_LDFLAGS = \
 	$(FORCE_SHARED_LIB_OPTIONS)
 
 #contains ust_tests_demo3.h provider probes
 liblttng_ust_provider_ust_tests_demo3_la_SOURCES = \
 	tp3.c ust_tests_demo3.h
-liblttng_ust_provider_ust_tests_demo3_la_LIBADD = -llttng-ust
+liblttng_ust_provider_ust_tests_demo3_la_LIBADD = $(UST_LIBS)
 liblttng_ust_provider_ust_tests_demo3_la_LDFLAGS = \
 	$(FORCE_SHARED_LIB_OPTIONS)
 
 noinst_PROGRAMS += demo
 demo_SOURCES = demo.c ust_tests_demo.h
 demo_CFLAGS = -DTEST_DYNAMIC_LINKAGE $(AM_CFLAGS)
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-demo_LDADD = -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-demo_LDADD = -lc
-endif
+demo_LDADD = $(DL_LIBS)
 
 EXTRA_DIST = $(COPYSCRIPTS)