From a12f3d624772f543137e60252101871cd6017a06 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 4 Jun 2019 15:16:19 -0400 Subject: [PATCH] lib: Rename to libbabeltrace2 We decided to make babeltrace2 co-installable with babeltrace1 since it offers backward compatibility but is not a full drop in replacement. Change-Id: I6da0230858601dd35ae35424540c73ba7b143858 Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/1403 Tested-by: jenkins Reviewed-by: Philippe Proulx --- .gitignore | 4 +-- CONTRIBUTING.adoc | 10 +++--- Makefile.am | 2 +- babeltrace-ctf.pc.in | 13 -------- babeltrace2-ctf.pc.in | 13 ++++++++ babeltrace.pc.in => babeltrace2.pc.in | 6 ++-- bindings/python/bt2/Makefile.am | 2 +- bindings/python/bt2/setup.py.in | 6 ++-- cli/Makefile.am | 10 +++--- common/Makefile.am | 4 +-- configure.ac | 10 +++--- ctfser/Makefile.am | 4 +-- fd-cache/Makefile.am | 4 +-- lib/Makefile.am | 39 ++++++++++++---------- lib/{babeltrace.c => babeltrace2.c} | 0 lib/plugin/plugin.c | 2 +- logging/Makefile.am | 4 +-- plugins/ctf/Makefile.am | 16 ++++----- plugins/ctf/common/Makefile.am | 6 ++-- plugins/ctf/fs-sink/Makefile.am | 6 ++-- plugins/ctf/fs-src/Makefile.am | 4 +-- plugins/ctf/lttng-live/Makefile.am | 6 ++-- plugins/lttng-utils/Makefile.am | 6 ++-- plugins/lttng-utils/debug-info/Makefile.am | 2 +- plugins/text/Makefile.am | 10 +++--- plugins/text/dmesg/Makefile.am | 4 +-- plugins/text/pretty/Makefile.am | 4 +-- plugins/utils/Makefile.am | 14 ++++---- plugins/utils/counter/Makefile.am | 4 +-- plugins/utils/dummy/Makefile.am | 4 +-- plugins/utils/muxer/Makefile.am | 4 +-- plugins/utils/trimmer/Makefile.am | 4 +-- python-plugin-provider/Makefile.am | 16 ++++----- tests/lib/Makefile.am | 2 +- tests/lib/test-plugin-plugins/Makefile.am | 4 +-- tests/plugins/Makefile.am | 12 +++---- 36 files changed, 132 insertions(+), 129 deletions(-) delete mode 100644 babeltrace-ctf.pc.in create mode 100644 babeltrace2-ctf.pc.in rename babeltrace.pc.in => babeltrace2.pc.in (58%) rename lib/{babeltrace.c => babeltrace2.c} (100%) diff --git a/.gitignore b/.gitignore index ac30a452..13fdf958 100644 --- a/.gitignore +++ b/.gitignore @@ -87,8 +87,8 @@ config/ core stamp-h1 __pycache__ -babeltrace.pc -babeltrace-ctf.pc +/babeltrace2.pc +/babeltrace2-ctf.pc TAGS cscope* doc/api/Doxyfile diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index bc6ff471..797b8865 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -225,7 +225,7 @@ image::doc/contributing-images/bt-ref13.png[] == Valgrind To use Valgrind on an application (for example, the CLI or a test) which -loads libbabeltrace, use: +loads libbabeltrace2, use: $ G_SLICE=always-malloc G_DEBUG=gc-friendly PYTHONMALLOC=malloc \ BABELTRACE_NO_DLCLOSE=1 valgrind --leak-check=full \ @@ -236,7 +236,7 @@ loads libbabeltrace, use: the Python plugin provider (Valgrind will probably show a lot of errors which originate from Python interpreter anyway). -`BABELTRACE_NO_DLCLOSE=1` makes libbabeltrace not close the shared +`BABELTRACE_NO_DLCLOSE=1` makes libbabeltrace2 not close the shared libraries (plugins) which it loads. This is needed to see the appropriate backtrace when Valgrind shows errors. @@ -282,7 +282,7 @@ The logging API headers are: ``:: Public header which a library user can use to control and read - libbabeltrace's current log level. + libbabeltrace2's current log level. ``:: Internal, generic logging API which you can use in any Babeltrace @@ -362,7 +362,7 @@ before it includes ``. In plugins, for example, there is one log level per component class, which makes log filtering easier during execution. + -In libbabeltrace, the user can set the current run-time log level with +In libbabeltrace2, the user can set the current run-time log level with the `bt_logging_set_global_level()` function, for example: + -- @@ -654,7 +654,7 @@ log level symbol. of your module's object in your module's root `Makefile.am`. . Add the log level initializing environment variable name to the - `log_level_env_var_names` array in `cli/babeltrace.c`. + `log_level_env_var_names` array in `cli/babeltrace2.c`. [[logging-instrument-source]] diff --git a/Makefile.am b/Makefile.am index 475b31a4..33abcf8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \ 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 diff --git a/babeltrace-ctf.pc.in b/babeltrace-ctf.pc.in deleted file mode 100644 index 8237607e..00000000 --- a/babeltrace-ctf.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Babeltrace CTF parser -Description: libbabeltrace-ctf provides the specific bits necessary to read a Common Trace Format (CTF) trace. -Version: @PACKAGE_VERSION@ -Requires: babeltrace -Requires.private: -Libs: -L${libdir} -lbabeltrace-ctf -Cflags: -I${includedir} - diff --git a/babeltrace2-ctf.pc.in b/babeltrace2-ctf.pc.in new file mode 100644 index 00000000..b20d98b1 --- /dev/null +++ b/babeltrace2-ctf.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Babeltrace CTF parser +Description: libbabeltrace2-ctf provides the specific bits necessary to read a Common Trace Format (CTF) trace. +Version: @PACKAGE_VERSION@ +Requires: babeltrace +Requires.private: +Libs: -L${libdir} -lbabeltrace2-ctf +Cflags: -I${includedir} + diff --git a/babeltrace.pc.in b/babeltrace2.pc.in similarity index 58% rename from babeltrace.pc.in rename to babeltrace2.pc.in index 7c33f281..646aeb47 100644 --- a/babeltrace.pc.in +++ b/babeltrace2.pc.in @@ -4,11 +4,11 @@ libdir=@libdir@ includedir=@includedir@ Name: Babeltrace -Description: libbabeltrace provides a reader for trace files, reading mainly the +Description: libbabeltrace2 provides a reader for trace files, reading mainly the Common Trace Format (CTF). Version: @PACKAGE_VERSION@ Requires: Requires.private: uuid popt -Libs: -L${libdir} -lbabeltrace -Cflags: -I${includedir} +Libs: -L${libdir} -lbabeltrace2 +Cflags: -I${includedir} diff --git a/bindings/python/bt2/Makefile.am b/bindings/python/bt2/Makefile.am index 44e96441..428588e8 100644 --- a/bindings/python/bt2/Makefile.am +++ b/bindings/python/bt2/Makefile.am @@ -1,5 +1,5 @@ # Since the shared object used by the python bindings is not built with -# libtool, we need to add the directory containing libbabeltrace to the +# libtool, we need to add the directory containing libbabeltrace2 to the # linker path. AM_LDFLAGS=-L$(top_builddir)/lib/.libs diff --git a/bindings/python/bt2/setup.py.in b/bindings/python/bt2/setup.py.in index de4f0a01..aeeac8f7 100644 --- a/bindings/python/bt2/setup.py.in +++ b/bindings/python/bt2/setup.py.in @@ -37,9 +37,9 @@ following command to your .bashrc/.zshrc: def main(): babeltrace_ext = Extension('bt2._native_bt', sources=['bt2/native_bt.i', 'bt2/logging.c'], - libraries=['babeltrace', 'glib-2.0'], - extra_objects=['@top_builddir@/logging/.libs/libbabeltrace-logging.a', - '@top_builddir@/common/.libs/libbabeltrace-common.a'],) + libraries=['babeltrace2', 'glib-2.0'], + extra_objects=['@top_builddir@/logging/.libs/libbabeltrace2-logging.a', + '@top_builddir@/common/.libs/libbabeltrace2-common.a'],) dist = setup(name='bt2', version='@PACKAGE_VERSION@', diff --git a/cli/Makefile.am b/cli/Makefile.am index 1ae51049..6a7cc881 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -41,10 +41,10 @@ babeltrace2_bin_LDFLAGS = $(LD_NO_AS_NEEDED) # not discard the plugins since the CLI does not use their symbols # directly). babeltrace2_bin_LDADD = \ - $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/lib/libbabeltrace2.la \ $(top_builddir)/compat/libcompat.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ $(POPT_LIBS) if ENABLE_BUILT_IN_PLUGINS @@ -89,8 +89,8 @@ babeltrace2_CFLAGS = $(AM_CFLAGS) -DBT_SET_DEFAULT_IN_TREE_CONFIGURATION babeltrace2_log_bin_SOURCES = babeltrace2-log.c babeltrace2_log_bin_LDADD = \ $(top_builddir)/compat/libcompat.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ $(POPT_LIBS) babeltrace2_log_bin_CFLAGS = $(AM_CFLAGS) '-DBT_CLI_PATH="$(abs_top_builddir)/cli/babeltrace2$(EXEEXT)"' diff --git a/common/Makefile.am b/common/Makefile.am index ce0b661a..75247fcd 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\" -noinst_LTLIBRARIES = libbabeltrace-common.la +noinst_LTLIBRARIES = libbabeltrace2-common.la -libbabeltrace_common_la_SOURCES = assert.c common.c logging.c logging.h +libbabeltrace2_common_la_SOURCES = assert.c common.c logging.c logging.h diff --git a/configure.ac b/configure.ac index 20f03456..dbc46cbb 100644 --- a/configure.ac +++ b/configure.ac @@ -377,8 +377,8 @@ AC_ARG_VAR([PYTHON_LIBS], [Library flags for Python, bypassing python-config]) AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) # PLUGINSDIR: Plugins directory -AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace/plugins]]) -AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace/plugins']) +AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2/plugins]]) +AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins']) # BABELTRACE_MINIMAL_LOG_LEVEL: AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (VERBOSE, DEBUG, INFO, WARN, ERROR (default), FATAL, or NONE)]) @@ -778,8 +778,8 @@ AC_CONFIG_FILES([ python-plugin-provider/Makefile plugins/lttng-utils/Makefile plugins/lttng-utils/debug-info/Makefile - babeltrace.pc - babeltrace-ctf.pc + babeltrace2.pc + babeltrace2-ctf.pc ]) AC_CONFIG_FILES([tests/cli/test_intersection], [chmod +x tests/cli/test_intersection]) @@ -921,5 +921,5 @@ AS_ECHO PPRINT_SUBTITLE([Install directories]) PPRINT_PROP_STRING([Binaries], [$report_bindir]) PPRINT_PROP_STRING([Libraries], [$report_libdir]) -PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace/plugins]) +PPRINT_PROP_STRING([Plugins], [$report_libdir/babeltrace2/plugins]) PPRINT_PROP_STRING([Configuration], [$report_sysconfdif]) diff --git a/ctfser/Makefile.am b/ctfser/Makefile.am index 21e605af..717621ac 100644 --- a/ctfser/Makefile.am +++ b/ctfser/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\" -noinst_LTLIBRARIES = libbabeltrace-ctfser.la +noinst_LTLIBRARIES = libbabeltrace2-ctfser.la -libbabeltrace_ctfser_la_SOURCES = ctfser.c logging.c logging.h +libbabeltrace2_ctfser_la_SOURCES = ctfser.c logging.c logging.h diff --git a/fd-cache/Makefile.am b/fd-cache/Makefile.am index 505ef8d2..9bc55df5 100644 --- a/fd-cache/Makefile.am +++ b/fd-cache/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\" -noinst_LTLIBRARIES = libbabeltrace-fd-cache.la +noinst_LTLIBRARIES = libbabeltrace2-fd-cache.la -libbabeltrace_fd_cache_la_SOURCES = \ +libbabeltrace2_fd_cache_la_SOURCES = \ fd-cache.c \ logging.c \ logging.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 1b4d0c11..fe6b88b0 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,45 +1,48 @@ SUBDIRS = trace-ir ctf-writer prio_heap plugin graph . -lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la +lib_LTLIBRARIES = libbabeltrace2.la libbabeltrace2-ctf.la -libbabeltrace_la_SOURCES = \ - babeltrace.c \ +libbabeltrace2_la_SOURCES = \ + babeltrace2.c \ value.c \ util.c \ lib-logging.c \ logging.c \ object-pool.c -libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \ +libbabeltrace2_la_LDFLAGS = $(LT_NO_UNDEFINED) \ -version-info $(BABELTRACE_LIBRARY_VERSION) -libbabeltrace_la_LIBADD = \ +libbabeltrace2_la_LIBADD = \ prio_heap/libprio_heap.la \ graph/libgraph.la \ plugin/libplugin.la \ trace-ir/libtrace-ir.la \ ctf-writer/libctf-writer.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/ctfser/libbabeltrace-ctfser.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/ctfser/libbabeltrace2-ctfser.la \ $(top_builddir)/compat/libcompat.la if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT -libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la +libbabeltrace2_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace2-python-plugin-provider.la endif -# Build a libbabeltrace-ctf library for backwards compatibility. -# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this +# FIXME: Should we drop this? We changed the basename of the library, +# libbabeltrace2 is not a drop-in replacement for libbabeltrace anymore. +# +# Build a libbabeltrace2-ctf library for backwards compatibility. +# CTF writer used to be in libbabeltrace2-ctf in Babeltrace 1, so this # file must still exist. As of Babeltrace 2, CTF writer is implemented -# in libbabeltrace. -libbabeltrace_ctf_la_SOURCES = $(libbabeltrace_la_SOURCES) -libbabeltrace_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \ +# in libbabeltrace2. +libbabeltrace2_ctf_la_SOURCES = $(libbabeltrace2_la_SOURCES) +libbabeltrace2_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \ -version-info $(BABELTRACE_LIBRARY_VERSION) -libbabeltrace_ctf_la_LIBADD = \ +libbabeltrace2_ctf_la_LIBADD = \ graph/libgraph.la \ trace-ir/libtrace-ir.la \ ctf-writer/libctf-writer.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/ctfser/libbabeltrace-ctfser.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/ctfser/libbabeltrace2-ctfser.la \ $(top_builddir)/compat/libcompat.la diff --git a/lib/babeltrace.c b/lib/babeltrace2.c similarity index 100% rename from lib/babeltrace.c rename to lib/babeltrace2.c diff --git a/lib/plugin/plugin.c b/lib/plugin/plugin.c index 7f00d69c..9f0bc2ac 100644 --- a/lib/plugin/plugin.c +++ b/lib/plugin/plugin.c @@ -46,7 +46,7 @@ #include #include -#define PYTHON_PLUGIN_PROVIDER_FILENAME "libbabeltrace-python-plugin-provider." G_MODULE_SUFFIX +#define PYTHON_PLUGIN_PROVIDER_FILENAME "libbabeltrace2-python-plugin-provider." G_MODULE_SUFFIX #define PYTHON_PLUGIN_PROVIDER_SYM_NAME bt_plugin_python_create_all_from_file #define PYTHON_PLUGIN_PROVIDER_SYM_NAME_STR TOSTRING(PYTHON_PLUGIN_PROVIDER_SYM_NAME) diff --git a/logging/Makefile.am b/logging/Makefile.am index be2cc150..559ea22f 100644 --- a/logging/Makefile.am +++ b/logging/Makefile.am @@ -1,3 +1,3 @@ -noinst_LTLIBRARIES = libbabeltrace-logging.la +noinst_LTLIBRARIES = libbabeltrace2-logging.la -libbabeltrace_logging_la_SOURCES = log.c +libbabeltrace2_logging_la_SOURCES = log.c diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am index 3577090d..5f5c859d 100644 --- a/plugins/ctf/Makefile.am +++ b/plugins/ctf/Makefile.am @@ -16,15 +16,15 @@ babeltrace_plugin_ctf_la_LDFLAGS = \ -avoid-version -module babeltrace_plugin_ctf_la_LIBADD = \ - common/libbabeltrace-plugin-ctf-common.la \ - fs-sink/libbabeltrace-plugin-ctf-fs-sink.la \ - fs-src/libbabeltrace-plugin-ctf-fs-src.la \ - lttng-live/libbabeltrace-plugin-ctf-lttng-live.la + common/libbabeltrace2-plugin-ctf-common.la \ + fs-sink/libbabeltrace2-plugin-ctf-fs-sink.la \ + fs-src/libbabeltrace2-plugin-ctf-fs-src.la \ + lttng-live/libbabeltrace2-plugin-ctf-lttng-live.la if !ENABLE_BUILT_IN_PLUGINS babeltrace_plugin_ctf_la_LIBADD += \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/ctfser/libbabeltrace-ctfser.la + $(top_builddir)/lib/libbabeltrace2.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/ctfser/libbabeltrace2-ctfser.la endif diff --git a/plugins/ctf/common/Makefile.am b/plugins/ctf/common/Makefile.am index 5b70fb4f..055355b1 100644 --- a/plugins/ctf/common/Makefile.am +++ b/plugins/ctf/common/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = metadata bfcr msg-iter utils -noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-common.la -libbabeltrace_plugin_ctf_common_la_SOURCES = print.h -libbabeltrace_plugin_ctf_common_la_LIBADD = \ +noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-common.la +libbabeltrace2_plugin_ctf_common_la_SOURCES = print.h +libbabeltrace2_plugin_ctf_common_la_LIBADD = \ $(builddir)/metadata/libctf-parser.la \ $(builddir)/metadata/libctf-ast.la \ $(builddir)/bfcr/libctf-bfcr.la \ diff --git a/plugins/ctf/fs-sink/Makefile.am b/plugins/ctf/fs-sink/Makefile.am index 3139ec50..6035b1a1 100644 --- a/plugins/ctf/fs-sink/Makefile.am +++ b/plugins/ctf/fs-sink/Makefile.am @@ -1,7 +1,7 @@ -noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-fs-sink.la +noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-fs-sink.la -libbabeltrace_plugin_ctf_fs_sink_la_LIBADD = -libbabeltrace_plugin_ctf_fs_sink_la_SOURCES = \ +libbabeltrace2_plugin_ctf_fs_sink_la_LIBADD = +libbabeltrace2_plugin_ctf_fs_sink_la_SOURCES = \ fs-sink.c \ fs-sink.h \ logging.c \ diff --git a/plugins/ctf/fs-src/Makefile.am b/plugins/ctf/fs-src/Makefile.am index 352f7634..012f4eb9 100644 --- a/plugins/ctf/fs-src/Makefile.am +++ b/plugins/ctf/fs-src/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-fs-src.la +noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-fs-src.la -libbabeltrace_plugin_ctf_fs_src_la_SOURCES = \ +libbabeltrace2_plugin_ctf_fs_src_la_SOURCES = \ data-stream-file.c \ data-stream-file.h \ file.c \ diff --git a/plugins/ctf/lttng-live/Makefile.am b/plugins/ctf/lttng-live/Makefile.am index f69bb8e2..aecd8391 100644 --- a/plugins/ctf/lttng-live/Makefile.am +++ b/plugins/ctf/lttng-live/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = \ +libbabeltrace2_plugin_ctf_lttng_live_la_SOURCES = \ lttng-live.c \ lttng-live.h \ data-stream.c \ @@ -14,7 +14,7 @@ libbabeltrace_plugin_ctf_lttng_live_la_SOURCES = \ logging.h if BABELTRACE_BUILD_WITH_MINGW -libbabeltrace_plugin_ctf_lttng_live_la_LIBADD = -lws2_32 +libbabeltrace2_plugin_ctf_lttng_live_la_LIBADD = -lws2_32 endif -noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-lttng-live.la +noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-lttng-live.la diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am index 969e296e..1d555a55 100644 --- a/plugins/lttng-utils/Makefile.am +++ b/plugins/lttng-utils/Makefile.am @@ -23,7 +23,7 @@ babeltrace_plugin_lttng_utils_la_LDFLAGS = \ if !ENABLE_BUILT_IN_PLUGINS babeltrace_plugin_lttng_utils_la_LIBADD += \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/logging/libbabeltrace-logging.la + $(top_builddir)/lib/libbabeltrace2.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la endif diff --git a/plugins/lttng-utils/debug-info/Makefile.am b/plugins/lttng-utils/debug-info/Makefile.am index e1ff7d7e..0dea0a46 100644 --- a/plugins/lttng-utils/debug-info/Makefile.am +++ b/plugins/lttng-utils/debug-info/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins noinst_LTLIBRARIES = libdebug-info.la libdebug_info_la_LIBADD = \ - $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la + $(top_builddir)/fd-cache/libbabeltrace2-fd-cache.la libdebug_info_la_SOURCES = \ bin-info.c \ diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am index f7bfff8e..c9b26c26 100644 --- a/plugins/text/Makefile.am +++ b/plugins/text/Makefile.am @@ -11,13 +11,13 @@ babeltrace_plugin_text_la_LDFLAGS = \ -avoid-version -module babeltrace_plugin_text_la_LIBADD = \ - pretty/libbabeltrace-plugin-text-pretty-cc.la \ - dmesg/libbabeltrace-plugin-text-dmesg-cc.la + pretty/libbabeltrace2-plugin-text-pretty-cc.la \ + dmesg/libbabeltrace2-plugin-text-dmesg-cc.la if !ENABLE_BUILT_IN_PLUGINS babeltrace_plugin_text_la_LIBADD += \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ + $(top_builddir)/lib/libbabeltrace2.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ $(top_builddir)/compat/libcompat.la endif diff --git a/plugins/text/dmesg/Makefile.am b/plugins/text/dmesg/Makefile.am index 7e63cf72..6e0f12ad 100644 --- a/plugins/text/dmesg/Makefile.am +++ b/plugins/text/dmesg/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-text-dmesg-cc.la +noinst_LTLIBRARIES = libbabeltrace2-plugin-text-dmesg-cc.la # ctf-text plugin -libbabeltrace_plugin_text_dmesg_cc_la_SOURCES = \ +libbabeltrace2_plugin_text_dmesg_cc_la_SOURCES = \ dmesg.c \ dmesg.h \ logging.h \ diff --git a/plugins/text/pretty/Makefile.am b/plugins/text/pretty/Makefile.am index 7af0f29d..72c0ab10 100644 --- a/plugins/text/pretty/Makefile.am +++ b/plugins/text/pretty/Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-text-pretty-cc.la +noinst_LTLIBRARIES = libbabeltrace2-plugin-text-pretty-cc.la # ctf-text plugin -libbabeltrace_plugin_text_pretty_cc_la_SOURCES = \ +libbabeltrace2_plugin_text_pretty_cc_la_SOURCES = \ logging.c \ logging.h \ pretty.c \ diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am index 7458909b..9211dd9e 100644 --- a/plugins/utils/Makefile.am +++ b/plugins/utils/Makefile.am @@ -10,14 +10,14 @@ babeltrace_plugin_utils_la_LDFLAGS = \ $(LT_NO_UNDEFINED) \ -avoid-version -module babeltrace_plugin_utils_la_LIBADD = \ - dummy/libbabeltrace-plugin-dummy-cc.la \ - muxer/libbabeltrace-plugin-muxer.la \ - counter/libbabeltrace-plugin-counter-cc.la \ - trimmer/libbabeltrace-plugin-trimmer.la + dummy/libbabeltrace2-plugin-dummy-cc.la \ + muxer/libbabeltrace2-plugin-muxer.la \ + counter/libbabeltrace2-plugin-counter-cc.la \ + trimmer/libbabeltrace2-plugin-trimmer.la if !ENABLE_BUILT_IN_PLUGINS babeltrace_plugin_utils_la_LIBADD += \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/logging/libbabeltrace-logging.la + $(top_builddir)/lib/libbabeltrace2.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la endif diff --git a/plugins/utils/counter/Makefile.am b/plugins/utils/counter/Makefile.am index 789df186..67d1656d 100644 --- a/plugins/utils/counter/Makefile.am +++ b/plugins/utils/counter/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-counter-cc.la -libbabeltrace_plugin_counter_cc_la_SOURCES = \ +noinst_LTLIBRARIES = libbabeltrace2-plugin-counter-cc.la +libbabeltrace2_plugin_counter_cc_la_SOURCES = \ counter.c \ counter.h \ logging.c \ diff --git a/plugins/utils/dummy/Makefile.am b/plugins/utils/dummy/Makefile.am index 107f0feb..197aaa12 100644 --- a/plugins/utils/dummy/Makefile.am +++ b/plugins/utils/dummy/Makefile.am @@ -1,4 +1,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-dummy-cc.la -libbabeltrace_plugin_dummy_cc_la_SOURCES = dummy.c dummy.h +noinst_LTLIBRARIES = libbabeltrace2-plugin-dummy-cc.la +libbabeltrace2_plugin_dummy_cc_la_SOURCES = dummy.c dummy.h diff --git a/plugins/utils/muxer/Makefile.am b/plugins/utils/muxer/Makefile.am index a85c8fbe..9c305bcd 100644 --- a/plugins/utils/muxer/Makefile.am +++ b/plugins/utils/muxer/Makefile.am @@ -1,4 +1,4 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins -noinst_LTLIBRARIES = libbabeltrace-plugin-muxer.la -libbabeltrace_plugin_muxer_la_SOURCES = muxer.c muxer.h logging.c logging.h +noinst_LTLIBRARIES = libbabeltrace2-plugin-muxer.la +libbabeltrace2_plugin_muxer_la_SOURCES = muxer.c muxer.h logging.c logging.h diff --git a/plugins/utils/trimmer/Makefile.am b/plugins/utils/trimmer/Makefile.am index 26917bde..050db0c4 100644 --- a/plugins/utils/trimmer/Makefile.am +++ b/plugins/utils/trimmer/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/plugins \ -I$(top_srcdir)/plugins/libctfcopytrace -noinst_LTLIBRARIES = libbabeltrace-plugin-trimmer.la -libbabeltrace_plugin_trimmer_la_SOURCES = \ +noinst_LTLIBRARIES = libbabeltrace2-plugin-trimmer.la +libbabeltrace2_plugin_trimmer_la_SOURCES = \ trimmer.c \ trimmer.h \ logging.c \ diff --git a/python-plugin-provider/Makefile.am b/python-plugin-provider/Makefile.am index 84093881..294629e3 100644 --- a/python-plugin-provider/Makefile.am +++ b/python-plugin-provider/Makefile.am @@ -1,19 +1,19 @@ AM_CPPFLAGS += $(PYTHON_INCLUDE) -lib_LTLIBRARIES = libbabeltrace-python-plugin-provider.la +lib_LTLIBRARIES = libbabeltrace2-python-plugin-provider.la -libbabeltrace_python_plugin_provider_la_SOURCES = \ +libbabeltrace2_python_plugin_provider_la_SOURCES = \ python-plugin-provider.c -libbabeltrace_python_plugin_provider_la_LDFLAGS = \ +libbabeltrace2_python_plugin_provider_la_LDFLAGS = \ $(LT_NO_UNDEFINED) \ -version-info $(BABELTRACE_LIBRARY_VERSION) \ $(PYTHON_LIBS) -libbabeltrace_python_plugin_provider_la_LIBADD = +libbabeltrace2_python_plugin_provider_la_LIBADD = if !ENABLE_BUILT_IN_PLUGINS -libbabeltrace_python_plugin_provider_la_LIBADD += \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ - $(top_builddir)/lib/libbabeltrace.la +libbabeltrace2_python_plugin_provider_la_LIBADD += \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ + $(top_builddir)/lib/libbabeltrace2.la endif diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 444654f9..e4930d88 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libtestcommon.la # it knows better and considers libraries with constructors having # side-effects as dead code. COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \ - $(top_builddir)/lib/libbabeltrace.la + $(top_builddir)/lib/libbabeltrace2.la test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la diff --git a/tests/lib/test-plugin-plugins/Makefile.am b/tests/lib/test-plugin-plugins/Makefile.am index 5bb34ca0..3a185b27 100644 --- a/tests/lib/test-plugin-plugins/Makefile.am +++ b/tests/lib/test-plugin-plugins/Makefile.am @@ -6,7 +6,7 @@ plugin_minimal_la_LDFLAGS = \ $(LT_NO_UNDEFINED) \ -rpath / -avoid-version -module plugin_minimal_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la + $(top_builddir)/lib/libbabeltrace2.la # source/filter/sink plugin plugin_sfs_la_SOURCES = sfs.c @@ -14,4 +14,4 @@ plugin_sfs_la_LDFLAGS = \ $(LT_NO_UNDEFINED) \ -rpath / -avoid-version -module plugin_sfs_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la + $(top_builddir)/lib/libbabeltrace2.la diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index 8744e8ae..b5d584b7 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -17,18 +17,18 @@ noinst_PROGRAMS += test_dwarf test_bin_info test_dwarf_LDADD = \ $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ + $(top_builddir)/fd-cache/libbabeltrace2-fd-cache.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ $(ELFUTILS_LIBS) \ $(LIBTAP) test_dwarf_SOURCES = test_dwarf.c test_bin_info_LDADD = \ $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \ - $(top_builddir)/logging/libbabeltrace-logging.la \ - $(top_builddir)/common/libbabeltrace-common.la \ + $(top_builddir)/fd-cache/libbabeltrace2-fd-cache.la \ + $(top_builddir)/logging/libbabeltrace2-logging.la \ + $(top_builddir)/common/libbabeltrace2-common.la \ $(ELFUTILS_LIBS) \ $(LIBTAP) test_bin_info_SOURCES = test_bin_info.c -- 2.34.1