From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 30 May 2019 15:35:17 +0000 (-0400)
Subject: Cleanup: Move build logic to python-plugin-provider Makefile
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=172e6876abbb70d0323a500e6b44f90641fbe2fb

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

Simplify the root Makefile, group the python provider build logic in a
single Makefile.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I580a3577e0a84f5b6e624ed2ed74a56a0b6b3960
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1353
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index f73b6d47..76ba8249 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,15 +6,8 @@ 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		\
diff --git a/python-plugin-provider/Makefile.am b/python-plugin-provider/Makefile.am
index 294629e3..2a269f0f 100644
--- a/python-plugin-provider/Makefile.am
+++ b/python-plugin-provider/Makefile.am
@@ -1,3 +1,4 @@
+if ENABLE_PYTHON_PLUGINS
 AM_CPPFLAGS += $(PYTHON_INCLUDE)
 
 lib_LTLIBRARIES = libbabeltrace2-python-plugin-provider.la
@@ -11,9 +12,12 @@ libbabeltrace2_python_plugin_provider_la_LDFLAGS = \
 
 libbabeltrace2_python_plugin_provider_la_LIBADD =
 
+# Link the Python plugin provider library with libbabeltrace2
+# when it's not built-in the babeltrace2 executable.
 if !ENABLE_BUILT_IN_PLUGINS
 libbabeltrace2_python_plugin_provider_la_LIBADD += \
 	$(top_builddir)/logging/libbabeltrace2-logging.la \
 	$(top_builddir)/common/libbabeltrace2-common.la \
 	$(top_builddir)/lib/libbabeltrace2.la
 endif
+endif # ENABLE_PYTHON_PLUGINS