From e6e508c974088acd37ab97753632745f30eabe3e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 26 Mar 2020 16:49:45 -0400 Subject: [PATCH] Add missing files to distribution Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I5b0be9c7c87dc7fef1c6f46f15091d4e3c2a09a8 --- doc/man/Makefile.am | 2 +- liblttng-ust-cyg-profile/Makefile.am | 3 +-- liblttng-ust-java/Makefile.am | 2 ++ liblttng-ust-libc-wrapper/Makefile.am | 4 ++-- snprintf/Makefile.am | 2 ++ tests/Makefile.am | 2 ++ tests/benchmark/Makefile.am | 2 +- tests/ctf-types/Makefile.am | 2 ++ tests/hello-many/Makefile.am | 2 ++ tests/hello.cxx/Makefile.am | 2 ++ tests/hello/Makefile.am | 2 ++ tests/same_line_tracepoint/Makefile.am | 2 ++ tests/snprintf/Makefile.am | 2 ++ tests/trace_event/Makefile.am | 3 +-- tests/tracepoint/Makefile.am | 4 ++-- tests/ust-elf/Makefile.am | 17 +++-------------- tools/Makefile.am | 5 ++--- 17 files changed, 31 insertions(+), 27 deletions(-) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 14aa4be7..126574b3 100644 --- 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 0ed2cd9c..100ca4ad 100644 --- 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 260774f9..4975b8b0 100644 --- 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 e510a11a..0787d8d5 100644 --- 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 b01d13ea..59b02723 100644 --- 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 c8505eb5..b1042dbe 100644 --- 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 ef9635c0..de44d2e9 100644 --- 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 42d803f2..0e47359c 100644 --- 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 ee648225..577718f5 100644 --- 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 4b0fb234..f8a718b4 100644 --- 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 d5e42d33..d249909c 100644 --- 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 ae1f773d..c2c2bbbf 100644 --- 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 719e1cc8..3e2b37c9 100644 --- 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 2105a181..4d0957f2 100644 --- 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 cf8aaa00..d7a50936 100644 --- 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 f115eea4..d14f03f7 100644 --- 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 1bdd3f8a..c5978bf8 100644 --- 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 -- 2.34.1