Fix: Don't override user variables within the build system

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

diff --git a/tests/regression/ust/ust-dl/Makefile.am b/tests/regression/ust/ust-dl/Makefile.am
index 5230007d4ca0fe04df2286d26eefe78e0f3deb7f..5a60c167914adc65a06d16e99ae997254879f308 100644 (file)
--- a/tests/regression/ust/ust-dl/Makefile.am
+++ b/tests/regression/ust/ust-dl/Makefile.am
@@ -2,11 +2,12 @@ if NO_SHARED
 # Do not build this test if shared libraries support was
 # explicitly disabled.
 
-CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \
-       libzzz.so libzzz.so.debug prog
+CLEANFILES = libbar.so libbar.so.debug libfoo.so libfoo.so.debug \
+       libzzz.so libzzz.so.debug prog libtp.so
 
-EXTRA_DIST = test_ust-dl test_ust-dl.py libfoo.c libfoo.h \
-       libbar.c libbar.h libzzz.c libzzz.h prog.c
+EXTRA_DIST = test_ust-dl test_ust-dl.py libbar.c libbar.h libbar-tp.h \
+       libbar-tp.c libfoo.c libfoo.h libfoo-tp.h libfoo-tp.c \
+       libzzz.c libzzz.h libzzz-tp.h libzzz-tp.c prog.c libtp.c
 
 else
 
@@ -14,13 +15,13 @@ objcopy_verbose = $(objcopy_verbose_@AM_V@)
 objcopy_verbose_ = $(objcopy_verbose_@AM_DEFAULT_V@)
 objcopy_verbose_0 = @echo OBJCOPY $@;
 
-AM_CPPFLAGS = -I$(srcdir) -g
+AM_CPPFLAGS += -I$(srcdir) -g
 
 noinst_PROGRAMS = prog
 prog_SOURCES = prog.c
 prog_LDADD = -ldl
 
-noinst_LTLIBRARIES = libzzz.la libbar.la libfoo.la
+noinst_LTLIBRARIES = libzzz.la libbar.la libfoo.la libtp.la
 
 libzzz_la_SOURCES = libzzz.c libzzz.h
 libzzz_la_LDFLAGS = -module -shared -avoid-version \
@@ -37,7 +38,11 @@ libfoo_la_LDFLAGS = -module -shared -avoid-version \
 libfoo_la_LIBADD = libbar.la
 
 CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \
-       libzzz.so libzzz.so.debug
+       libzzz.so libzzz.so.debug libtp.so
+
+libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \
+       libzzz-tp.h libzzz-tp.c
+libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir)
 
 # Extract debug symbols
 libfoo.so.debug: libfoo.la
@@ -58,10 +63,13 @@ libzzz.so: libzzz.so.debug
        @cp -f .libs/libzzz.so libzzz.so
        $(objcopy_verbose)$(OBJCOPY) --strip-debug --add-gnu-debuglink=libzzz.so.debug libzzz.so
 
+libtp.so: libtp.la
+       @cp -f .libs/libtp.so libtp.so
+
 noinst_SCRIPTS = test_ust-dl test_ust-dl.py
 EXTRA_DIST = test_ust-dl test_ust-dl.py
 
-all-local: libfoo.so libbar.so libzzz.so
+all-local: libfoo.so libbar.so libzzz.so libtp.so
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
                for script in $(EXTRA_DIST); do \
                        cp -f $(srcdir)/$$script $(builddir); \