Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / tools / health / Makefile.am

diff --git a/tests/regression/tools/health/Makefile.am b/tests/regression/tools/health/Makefile.am
index ed13743a41303970a7ea098ab651b035c6baf4ea..c8deb5e5d93ee1205fa9f2d1667f7069df9d5041 100644 (file)
--- 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
-AM_LDFLAGS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -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
-EXTRA_DIST = test_thread_exit test_thread_stall test_tp_fail \
-               test_health.sh
+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