From 3b37d46561d6c6edba3b729f48a0f72699dcdc20 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 24 Feb 2016 01:23:56 -0500 Subject: [PATCH] Move plugin system sources to lib/plugin-system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- configure.ac | 1 + converter/Makefile.am | 3 +-- lib/Makefile.am | 5 ++-- lib/plugin-system/Makefile.am | 13 +++++++++++ .../plugin-system}/component-class.c | 0 .../plugin-system}/component-factory.c | 0 {plugins => lib/plugin-system}/component.c | 0 {plugins => lib/plugin-system}/iterator.c | 0 {plugins => lib/plugin-system}/plugin.c | 0 {plugins => lib/plugin-system}/sink.c | 0 {plugins => lib/plugin-system}/source.c | 0 plugins/Makefile.am | 23 +------------------ plugins/ctf/Makefile.am | 1 - plugins/ctf/lttng-live/Makefile.am | 8 ------- plugins/ctf/reader/Makefile.am | 9 -------- plugins/text/Makefile.am | 5 ++-- 16 files changed, 21 insertions(+), 47 deletions(-) create mode 100644 lib/plugin-system/Makefile.am rename {plugins => lib/plugin-system}/component-class.c (100%) rename {plugins => lib/plugin-system}/component-factory.c (100%) rename {plugins => lib/plugin-system}/component.c (100%) rename {plugins => lib/plugin-system}/iterator.c (100%) rename {plugins => lib/plugin-system}/plugin.c (100%) rename {plugins => lib/plugin-system}/sink.c (100%) rename {plugins => lib/plugin-system}/source.c (100%) diff --git a/configure.ac b/configure.ac index d5aa005b..c4045cd7 100644 --- a/configure.ac +++ b/configure.ac @@ -357,6 +357,7 @@ AC_CONFIG_FILES([ doc/images/Makefile lib/Makefile lib/prio_heap/Makefile + lib/plugin-system/Makefile include/Makefile bindings/Makefile bindings/python/Makefile diff --git a/converter/Makefile.am b/converter/Makefile.am index 789ff58c..b7e12645 100644 --- a/converter/Makefile.am +++ b/converter/Makefile.am @@ -17,8 +17,7 @@ babeltrace_LDADD = \ $(top_builddir)/formats/ctf-text/libbabeltrace-ctf-text.la \ $(top_builddir)/formats/ctf-metadata/libbabeltrace-ctf-metadata.la \ $(top_builddir)/formats/bt-dummy/libbabeltrace-dummy.la \ - $(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la \ - $(top_builddir)/plugins/libbabeltrace-plugin.la + $(top_builddir)/formats/lttng-live/libbabeltrace-lttng-live.la if ENABLE_DEBUG_INFO babeltrace_LDADD += $(top_builddir)/lib/libdebug-info.la diff --git a/lib/Makefile.am b/lib/Makefile.am index 8096d789..9e14ea51 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = prio_heap . +SUBDIRS = prio_heap plugin-system . AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include @@ -30,4 +30,5 @@ endif libbabeltrace_la_LIBADD = \ prio_heap/libprio_heap.la \ $(top_builddir)/types/libbabeltrace_types.la \ - $(top_builddir)/compat/libcompat.la + $(top_builddir)/compat/libcompat.la \ + plugin-system/libplugin-system.la diff --git a/lib/plugin-system/Makefile.am b/lib/plugin-system/Makefile.am new file mode 100644 index 00000000..9fa9d933 --- /dev/null +++ b/lib/plugin-system/Makefile.am @@ -0,0 +1,13 @@ +AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include + +noinst_LTLIBRARIES = libplugin-system.la + +# Plug-in system library +libplugin_system_la_SOURCES = \ + component.c \ + component-class.c \ + component-factory.c \ + plugin.c \ + source.c \ + sink.c \ + iterator.c diff --git a/plugins/component-class.c b/lib/plugin-system/component-class.c similarity index 100% rename from plugins/component-class.c rename to lib/plugin-system/component-class.c diff --git a/plugins/component-factory.c b/lib/plugin-system/component-factory.c similarity index 100% rename from plugins/component-factory.c rename to lib/plugin-system/component-factory.c diff --git a/plugins/component.c b/lib/plugin-system/component.c similarity index 100% rename from plugins/component.c rename to lib/plugin-system/component.c diff --git a/plugins/iterator.c b/lib/plugin-system/iterator.c similarity index 100% rename from plugins/iterator.c rename to lib/plugin-system/iterator.c diff --git a/plugins/plugin.c b/lib/plugin-system/plugin.c similarity index 100% rename from plugins/plugin.c rename to lib/plugin-system/plugin.c diff --git a/plugins/sink.c b/lib/plugin-system/sink.c similarity index 100% rename from plugins/sink.c rename to lib/plugin-system/sink.c diff --git a/plugins/source.c b/lib/plugin-system/source.c similarity index 100% rename from plugins/source.c rename to lib/plugin-system/source.c diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 28bd175d..41568098 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,22 +1 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - -SUBDIRS = . ctf text - -lib_LTLIBRARIES = libbabeltrace-plugin.la - -# Plug-in system library -libbabeltrace_plugin_la_SOURCES = \ - component.c \ - component-class.c \ - component-factory.c \ - plugin.c \ - source.c \ - sink.c \ - iterator.c - -# Request that the linker keeps all static library objects. -libbabeltrace_plugin_la_LDFLAGS = \ - -Wl,--no-as-needed -version-info $(BABELTRACE_LIBRARY_VERSION) - -libbabeltrace_plugin_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la +SUBDIRS = ctf text diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am index e916b160..27227083 100644 --- a/plugins/ctf/Makefile.am +++ b/plugins/ctf/Makefile.am @@ -15,6 +15,5 @@ libbabeltrace_plugin_ctf_la_LDFLAGS = \ libbabeltrace_plugin_ctf_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/plugins/libbabeltrace-plugin.la \ $(top_builddir)/plugins/ctf/reader/libbabeltrace-plugin-ctf-reader.la \ $(top_builddir)/plugins/ctf/lttng-live/libbabeltrace-plugin-ctf-lttng-live.la diff --git a/plugins/ctf/lttng-live/Makefile.am b/plugins/ctf/lttng-live/Makefile.am index f1b9177f..755be6e8 100644 --- a/plugins/ctf/lttng-live/Makefile.am +++ b/plugins/ctf/lttng-live/Makefile.am @@ -5,11 +5,3 @@ libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = lttng-live.c noinst_HEADERS = lttng-live-internal.h noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-lttng-live.la -# Request that the linker keeps all static library objects. -libbabeltrace_plugin_ctf_lttng_live_la_LDFLAGS = \ - $(LD_NO_AS_NEEDED) - -libbabeltrace_plugin_ctf_lttng_live_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/plugins/libbabeltrace-plugin.la diff --git a/plugins/ctf/reader/Makefile.am b/plugins/ctf/reader/Makefile.am index 7e50953f..4233d4ae 100644 --- a/plugins/ctf/reader/Makefile.am +++ b/plugins/ctf/reader/Makefile.am @@ -6,12 +6,3 @@ noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-reader.la # Plug-in system library libbabeltrace_plugin_ctf_reader_la_SOURCES = \ reader.c - -# Request that the linker keeps all static librarie objects. -libbabeltrace_plugin_ctf_reader_la_LDFLAGS = \ - -Wl,--no-as-needed - -libbabeltrace_plugin_ctf_reader_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/plugins/libbabeltrace-plugin.la diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am index eb7cd197..55f4c8cb 100644 --- a/plugins/text/Makefile.am +++ b/plugins/text/Makefile.am @@ -10,9 +10,8 @@ libbabeltrace_plugin_ctf_text_la_SOURCES = \ # Request that the linker keeps all static library objects. libbabeltrace_plugin_ctf_text_la_LDFLAGS = \ - $(LD_NO_AS_NEEDED) -version-info $(BABELTRACE_LIBRARY_VERSION) + -version-info $(BABELTRACE_LIBRARY_VERSION) libbabeltrace_plugin_ctf_text_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/plugins/libbabeltrace-plugin.la + $(top_builddir)/formats/ctf/libbabeltrace-ctf.la -- 2.34.1