From 39cfa40f873307c147731db769a8c428d208528d Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Thu, 21 Jan 2016 13:59:10 -0500
Subject: [PATCH] Build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 include/Makefile.am                       | 1 -
 include/babeltrace/plugin/plugin-system.h | 3 ---
 plugins/component-factory.c               | 1 +
 plugins/ctf/text/Makefile.am              | 2 +-
 plugins/ctf/text/text.c                   | 2 ++
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index bc1621ca..3ce14183 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -48,7 +48,6 @@ babeltraceplugininclude_HEADERS = \
 	babeltrace/plugin/notification/notification.h \
 	babeltrace/plugin/notification/event.h \
 	babeltrace/plugin/notification/iterator.h \
-	babeltrace/plugin/notification/notification.h \
 	babeltrace/plugin/notification/packet.h
 
 noinst_HEADERS = \
diff --git a/include/babeltrace/plugin/plugin-system.h b/include/babeltrace/plugin/plugin-system.h
index b5158d8b..44b79a19 100644
--- a/include/babeltrace/plugin/plugin-system.h
+++ b/include/babeltrace/plugin/plugin-system.h
@@ -30,9 +30,6 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/objects.h>
-#include <babeltrace/objects.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/component-factory.c b/plugins/component-factory.c
index 2bee2703..a7fdab38 100644
--- a/plugins/component-factory.c
+++ b/plugins/component-factory.c
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <gmodule.h>
+#include <stdbool.h>
 
 #define NATIVE_PLUGIN_SUFFIX ".so"
 #define NATIVE_PLUGIN_SUFFIX_LEN sizeof(NATIVE_PLUGIN_SUFFIX)
diff --git a/plugins/ctf/text/Makefile.am b/plugins/ctf/text/Makefile.am
index 9af02eb9..eb7cd197 100644
--- a/plugins/ctf/text/Makefile.am
+++ b/plugins/ctf/text/Makefile.am
@@ -10,7 +10,7 @@ libbabeltrace_plugin_ctf_text_la_SOURCES = \
 
 # Request that the linker keeps all static library objects.
 libbabeltrace_plugin_ctf_text_la_LDFLAGS = \
-	-Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION)
+	$(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_plugin_ctf_text_la_LIBADD = \
 	$(top_builddir)/lib/libbabeltrace.la \
diff --git a/plugins/ctf/text/text.c b/plugins/ctf/text/text.c
index 28863679..a839ac69 100644
--- a/plugins/ctf/text/text.c
+++ b/plugins/ctf/text/text.c
@@ -32,6 +32,7 @@
 #include <babeltrace/plugin/notification/notification.h>
 #include <glib.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 static
 const char *plugin_name = "ctf-text";
@@ -111,6 +112,7 @@ static
 enum bt_component_status ctf_text_init(
 		struct bt_component *component)
 {
+	printf(__bt_plugin_name);
 	return BT_COMPONENT_STATUS_OK;
 }
 
-- 
2.34.1