X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2FMakefile.am;h=c8deb5e5d93ee1205fa9f2d1667f7069df9d5041;hb=5da3fc8579a9f93ea4767729a107784bf2d034ae;hp=643dd31d2081b3deaba926d78575d26e3ee5770c;hpb=d7c5433442024fc55c8e9e4299c9105ed2c961ae;p=lttng-tools.git

diff --git a/tests/regression/tools/health/Makefile.am b/tests/regression/tools/health/Makefile.am
index 643dd31d2..c8deb5e5d 100644
--- a/tests/regression/tools/health/Makefile.am
+++ b/tests/regression/tools/health/Makefile.am
@@ -1,16 +1,16 @@
-AM_CFLAGS = -I. -O2 -g -I$(top_srcdir)/include
-AM_LDFLAGS =
+AM_CPPFLAGS += -I. -I$(top_srcdir)/include
 
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-LIBS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-LIBS += -lc
-endif
+COPYSCRIPTS = test_thread_exit test_thread_stall test_tp_fail \
+	test_health.sh test_thread_ok
+dist_noinst_SCRIPTS = $(COPYSCRIPTS)
 
 if NO_SHARED
 # Do not build this test if shared libraries support was
 # explicitly disabled.
+
+EXTRA_DIST = health_exit.c health_stall.c health_fail.c \
+	health_check.c $(COPYSCRIPTS)
+
 else
 # In order to test the health check feature, the libhealth* libs
 # must be built as .so to be able to LD_PRELOAD them.
@@ -20,38 +20,40 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 # Health thread exit ld_preloaded test lib
 libhealthexit_la_SOURCES=health_exit.c
 libhealthexit_la_LDFLAGS= $(FORCE_SHARED_LIB_OPTIONS)
+libhealthexit_la_LIBADD = $(DL_LIBS)
 
 # Health thread stall ld_preloaded test lib
 libhealthstall_la_SOURCES=health_stall.c
 libhealthstall_la_LDFLAGS= $(FORCE_SHARED_LIB_OPTIONS)
+libhealthstall_la_LIBADD = $(DL_LIBS)
 
 # Health thread fail ld_preloaded test lib
 libhealthtpfail_la_SOURCES=health_fail.c
 libhealthtpfail_la_LDFLAGS= $(FORCE_SHARED_LIB_OPTIONS)
+libhealthtpfail_la_LIBADD = $(DL_LIBS)
 
 noinst_PROGRAMS = health_check
 noinst_LTLIBRARIES = libhealthexit.la libhealthstall.la libhealthtpfail.la
 
 health_check_SOURCES = health_check.c $(UTILS)
 health_check_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
-		     $(top_builddir)/src/common/libcommon.la
-endif
+		     $(top_builddir)/src/common/libcommon.la \
+		     $(DL_LIBS)
+
+EXTRA_DIST = $(COPYSCRIPTS)
 
-dist_noinst_SCRIPTS = test_thread_exit test_thread_stall test_tp_fail \
-		test_health.sh test_thread_ok
-EXTRA_DIST = test_thread_exit test_thread_stall test_tp_fail \
-		test_health.sh test_thread_ok
+endif
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(EXTRA_DIST); do \
+		for script in $(COPYSCRIPTS); do \
 			cp -f $(srcdir)/$$script $(builddir); \
 		done; \
 	fi
 
 clean-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(EXTRA_DIST); do \
+		for script in $(COPYSCRIPTS); do \
 			rm -f $(builddir)/$$script; \
 		done; \
 	fi