Add missing files to distribution

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I5b0be9c7c87dc7fef1c6f46f15091d4e3c2a09a8

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 14aa4be7c82d9a5a8e679d6c1d9857b62595f7a9..126574b301ad941f8d5494eda6b175f3fe103242 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -119,4 +119,4 @@ dist-hook:
 endif # !MAN_PAGES_OPT
 
 # Always distribute the source files.
-EXTRA_DIST += $(MAN_TXT) $(COMMON_TXT) $(XSL_FILE) $(ASCIIDOC_CONF)
+EXTRA_DIST += $(MAN_TXT) $(COMMON_TXT) $(XSL_FILE) $(ASCIIDOC_CONF) README.md

diff --git a/liblttng-ust-cyg-profile/Makefile.am b/liblttng-ust-cyg-profile/Makefile.am
index 0ed2cd9cae6169f8646368d2b6b6b12128fad540..100ca4adb91ef586efdaee33091b5769bd786719 100644 (file)
--- a/liblttng-ust-cyg-profile/Makefile.am
+++ b/liblttng-ust-cyg-profile/Makefile.am
@@ -22,5 +22,4 @@ liblttng_ust_cyg_profile_fast_la_LIBADD = \
        -llttng-ust \
        $(DL_LIBS)
 
-noinst_SCRIPTS = run run-fast
-EXTRA_DIST = run run-fast
+dist_noinst_SCRIPTS = run run-fast

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 260774f972c81540854b9d20828be9651341f7d2..4975b8b0989801052d1486c9e2a403aaebb13d7d 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -33,4 +33,6 @@ endif
 
 all-local: org_lttng_ust_LTTngUst.h
 
+EXTRA_DIST = README
+
 CLEANFILES = $(jarfile) $(pkgpath)/*.class jni-header.stamp org_lttng_ust_LTTngUst.h

diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/liblttng-ust-libc-wrapper/Makefile.am
index e510a11a2c319c0e01493d431977b74ef45f75fd..0787d8d514a20395f434ec81a16802fba122f3d1 100644 (file)
--- a/liblttng-ust-libc-wrapper/Makefile.am
+++ b/liblttng-ust-libc-wrapper/Makefile.am
@@ -22,5 +22,5 @@ liblttng_ust_pthread_wrapper_la_LIBADD = \
        -llttng-ust \
        $(DL_LIBS)
 
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+dist_noinst_SCRIPTS = run
+EXTRA_DIST = README

diff --git a/snprintf/Makefile.am b/snprintf/Makefile.am
index b01d13ead1aa6c6a75f3b5e7ffeb174c8ef39f31..59b0272325adeefd6ed6c9d4bff8e15bb39fed4b 100644 (file)
--- a/snprintf/Makefile.am
+++ b/snprintf/Makefile.am
@@ -20,3 +20,5 @@ libustsnprintf_la_SOURCES = \
 
 libustsnprintf_la_LDFLAGS = -no-undefined -static
 libustsnprintf_la_CFLAGS = -DUST_COMPONENT="lttng_ust_snprintf" -fPIC $(AM_CFLAGS)
+
+EXTRA_DIST = README

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c8505eb5ff77da7aec5ee633125c575abd09ef14..b1042dbef1e64c7b0307a2b528a751792e962c9c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,8 @@ TESTS = snprintf/test_snprintf \
        ust-elf/test_ust_elf \
        gcc-weak-hidden/test_gcc_weak_hidden
 
+EXTRA_DIST = README
+
 check-loop:
        while [ 0 ]; do \
                $(MAKE) $(AM_MAKEFLAGS) check; \

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index ef9635c0da9b567aa9617f9afd5109dd5e9257ce..de44d2e9555f368433754f16a734535c06aa7892 100644 (file)
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -10,4 +10,4 @@ bench2_CFLAGS = -DTRACING $(AM_CFLAGS)
 
 dist_noinst_SCRIPTS = test_benchmark ptime
 
-extra_DIST = README
+EXTRA_DIST = README

diff --git a/tests/ctf-types/Makefile.am b/tests/ctf-types/Makefile.am
index 42d803f2a409ce6cb3fc7c63ce7703c9e0e2b7b4..0e47359cc37ed2b939b7fd694c66936e42c7393f 100644 (file)
--- a/tests/ctf-types/Makefile.am
+++ b/tests/ctf-types/Makefile.am
@@ -4,3 +4,5 @@ noinst_PROGRAMS = ctf-types
 ctf_types_SOURCES = ctf-types.c tp.c ust_tests_ctf_types.h
 ctf_types_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS)
 ctf_types_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
+
+EXTRA_DIST = README

diff --git a/tests/hello-many/Makefile.am b/tests/hello-many/Makefile.am
index ee64822551a3f83e98c71484d4df05e0a077f769..577718f503f9c88b1d3fb69388fd5e3218959a0d 100644 (file)
--- a/tests/hello-many/Makefile.am
+++ b/tests/hello-many/Makefile.am
@@ -4,3 +4,5 @@ noinst_PROGRAMS = hello-many
 hello_many_SOURCES = hello-many.c tp.c ust_tests_hello_many.h
 hello_many_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS)
 hello_many_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
+
+EXTRA_DIST = README

diff --git a/tests/hello.cxx/Makefile.am b/tests/hello.cxx/Makefile.am
index 4b0fb2344fc5107ab8584aa43ed8b2f8edac61fd..f8a718b43438950db5a638ce5c0016cdadeb73d1 100644 (file)
--- a/tests/hello.cxx/Makefile.am
+++ b/tests/hello.cxx/Makefile.am
@@ -3,3 +3,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 noinst_PROGRAMS = hello
 hello_SOURCES = hello.cpp tp-cpp.cpp ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS)
+
+EXTRA_DIST = README

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index d5e42d331eb41d4b62677a74cc04f3dbfb71a624..d249909cfb65ba40feaa641ff6b0ea0bff1aeebc 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -4,3 +4,5 @@ noinst_PROGRAMS = hello
 hello_SOURCES = hello.c tp.c ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS)
 hello_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS)
+
+EXTRA_DIST = README

diff --git a/tests/same_line_tracepoint/Makefile.am b/tests/same_line_tracepoint/Makefile.am
index ae1f773d74dfdefb61fc181d5e201def7615c292..c2c2bbbfe52f60296cd067ffdf2f1102b05d480b 100644 (file)
--- a/tests/same_line_tracepoint/Makefile.am
+++ b/tests/same_line_tracepoint/Makefile.am
@@ -3,3 +3,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -Wsystem-headers
 noinst_PROGRAMS = same_line_tracepoint
 same_line_tracepoint_SOURCES = same_line_tracepoint.c ust_tests_sameline.h
 same_line_tracepoint_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS)
+
+EXTRA_DIST = README

diff --git a/tests/snprintf/Makefile.am b/tests/snprintf/Makefile.am
index 719e1cc8a55c6ddee0805f388cd2e9f7beb499bb..3e2b37c96d27e233fb5dfb59eeab2d21682c9be5 100644 (file)
--- a/tests/snprintf/Makefile.am
+++ b/tests/snprintf/Makefile.am
@@ -4,3 +4,5 @@ noinst_PROGRAMS = test_snprintf
 test_snprintf_SOURCES = snprintf.c
 test_snprintf_LDADD = $(top_builddir)/snprintf/libustsnprintf.la \
        $(top_builddir)/tests/utils/libtap.a
+
+EXTRA_DIST = README

diff --git a/tests/trace_event/Makefile.am b/tests/trace_event/Makefile.am
index 2105a181ef2c505833ec62ebe6ae6a57cb432ea6..4d0957f2cf0ac4ed58e2ceb055f03a43a2ff9e4a 100644 (file)
--- a/tests/trace_event/Makefile.am
+++ b/tests/trace_event/Makefile.am
@@ -6,5 +6,4 @@ trace_event_test_LDADD = $(top_builddir)/libust/libust.la \
                         $(top_builddir)/libust-initializer.o -lpthread -lrt
 
 CFLAGS_trace_event_test.o = -I$(src) $(AM_CFLAGS)
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+dist_noinst_SCRIPTS = run

diff --git a/tests/tracepoint/Makefile.am b/tests/tracepoint/Makefile.am
index cf8aaa0058dd7e3f22225488c977e30fae936c94..d7a5093686d3a757083b53127e60b86a8602fa7e 100644 (file)
--- a/tests/tracepoint/Makefile.am
+++ b/tests/tracepoint/Makefile.am
@@ -10,5 +10,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 #ust/tests/tracepoint/tracepoint_test.c:64: undefined reference to
 #`register_trace_ust_event_msg'
 #CFLAGS_tracepoint_test.o = -I$(src) $(AM_CFLAGS)
-noinst_SCRIPTS = run
-EXTRA_DIST = run
+
+dist_noinst_SCRIPTS = run

diff --git a/tests/ust-elf/Makefile.am b/tests/ust-elf/Makefile.am
index f115eea4629af7ac18999aa85041e6aaebd31bc7..d14f03f7cc777a67eb7621368585173a09f91794 100644 (file)
--- a/tests/ust-elf/Makefile.am
+++ b/tests/ust-elf/Makefile.am
@@ -5,18 +5,7 @@ ust_elf_SOURCES = ust-elf.c
 ust_elf_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \
        $(top_builddir)/tests/utils/libtap.a
 
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = \
-       $(srcdir)/data/main.c \
-       $(srcdir)/data/aarch64_be/main.elf \
-       $(srcdir)/data/aarch64_be/main.elf.debug \
-       $(srcdir)/data/armeb/main.elf \
-       $(srcdir)/data/armeb/main.elf.debug \
-       $(srcdir)/data/x86/main.elf \
-       $(srcdir)/data/x86/main.elf.debug \
-       $(srcdir)/data/x86_64/main.elf \
-       $(srcdir)/data/x86_64/main.elf.debug \
-       $(srcdir)/data/pic/hello.exec \
-       $(srcdir)/data/pic/hello.pie \
-       $(srcdir)/data/pic/hello.pic \
-       $(srcdir)/data/pic/hello.c \
-       $(srcdir)/data/pic/libhello.c
+       $(srcdir)/data \
+       README.md

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1bdd3f8a4ee2b3a89bc3bccb2fdd941fe4fc46fd..c5978bf84e01aab90e43ba7e3b2d6733f9895792 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,16 +1,15 @@
 dist_bin_SCRIPTS = lttng-gen-tp
-EXTRA_DIST = lttng-gen-tp
 
 all-local:
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-               for script in $(EXTRA_DIST); do \
+               for script in $(dist_bin_SCRIPTS); 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 $(dist_bin_SCRIPTS); do \
                        rm -f $(builddir)/$$script; \
                done; \
        fi