Cleanup: Move build logic to python-plugin-provider Makefile

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 475b31a4d7bcabbe273af9680f262044ee68a819..76ba8249d5bd33e28086f4d390b72de1c63c6def 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,29 +6,25 @@ SUBDIRS = include             \
        fd-cache                \
        compat                  \
        logging                 \
-       lib
-
-if ENABLE_PYTHON_PLUGINS
-# Only build the Python plugin provider shared object if the
-# configuration doesn't ask to make it built-in.
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=                     \
+       lib                     \
+       python-plugin-provider  \
        plugins                 \
        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
 
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.pc
 
 # This is a convenience target, it's not part of the build process.
 CONTRIBUTING.html: CONTRIBUTING.adoc