Build fix

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index bc1621ca4178eeb4b01c923aa71cf3d927b28ab7..3ce14183ef0fd3e516709b2a389223a1f024ba74 100644 (file)
--- 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 b5158d8b47beaeb06ba3bd9c32f6b915be6f1fc4..44b79a192114c49e7468ed2dbd27cd4916819afe 100644 (file)
--- 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 2bee2703a56bc351c11e81787963dc8726fb98ce..a7fdab3890e801587c3d635225a6d67e2c03b0be 100644 (file)
--- 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 9af02eb94039bcba241d2612f7e4f8de38872304..eb7cd197ce93c4f8476addff116ca968bc4b0478 100644 (file)
--- 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 28863679efaf90cdff3e0bc43d5bc594febf63b9..a839ac69ff845711d27285465c9eedfa87031648 100644 (file)
--- 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;
 }