Cleanup: remove useless Makefiles from extras

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I8eaf99fab641f264699c16b2069b81c16e27bda5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1354
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 33abcf8b71d980d4742e5f5ee8d8bee7dcb11190..f73b6d475aba61a0930d1608523ff304e24257b5 100644 (file)
--- 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 51c2ab59803c44f4406a0a503919407ebd9fc945..3fc2eb94dea64d229a556289ac1c72d6d71dc930 100644 (file)
--- 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 (file)
index d48fa3d..0000000
--- 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 (file)
index 47dcc33..0000000
--- a/extras/valgrind/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = popt.supp