From 52f120df444c1ba7896a65360374fea7cfebf865 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 30 May 2019 11:36:26 -0400 Subject: [PATCH] Cleanup: remove useless Makefiles from extras Signed-off-by: Michael Jeanson Change-Id: I8eaf99fab641f264699c16b2069b81c16e27bda5 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1354 CI-Build: Philippe Proulx Reviewed-by: Philippe Proulx --- Makefile.am | 5 ++++- configure.ac | 2 -- extras/Makefile.am | 2 -- extras/valgrind/Makefile.am | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 extras/Makefile.am delete mode 100644 extras/valgrind/Makefile.am diff --git a/Makefile.am b/Makefile.am index 33abcf8b..f73b6d47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,12 @@ SUBDIRS += \ cli \ bindings \ doc \ - extras \ tests +# Directories added to EXTRA_DIST will be recursively copied to the distribution. +EXTRA_DIST = \ + extras + dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \ std-ext-lib.txt README CONTRIBUTING.adoc diff --git a/configure.ac b/configure.ac index 51c2ab59..3fc2eb94 100644 --- a/configure.ac +++ b/configure.ac @@ -760,8 +760,6 @@ AC_CONFIG_FILES([ tests/utils/Makefile tests/utils/tap/Makefile tests/plugins/Makefile - extras/Makefile - extras/valgrind/Makefile plugins/Makefile plugins/ctf/Makefile plugins/ctf/common/Makefile diff --git a/extras/Makefile.am b/extras/Makefile.am deleted file mode 100644 index d48fa3d6..00000000 --- a/extras/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = valgrind -EXTRA_DIST = gen-babeltrace-h.py diff --git a/extras/valgrind/Makefile.am b/extras/valgrind/Makefile.am deleted file mode 100644 index 47dcc332..00000000 --- a/extras/valgrind/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = popt.supp -- 2.34.1