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 <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1403
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/.gitignore b/.gitignore
index ac30a452954c5d54ad0a3acd4f667534490cbde8..13fdf9581ce42dea760662fc5aeb71827896318f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -87,8 +87,8 @@ config/
 core
 stamp-h1
 __pycache__
 core
 stamp-h1
 __pycache__

-babeltrace.pc
-babeltrace-ctf.pc
+/babeltrace2.pc
+/babeltrace2-ctf.pc

 TAGS
 cscope*
 doc/api/Doxyfile
 TAGS
 cscope*
 doc/api/Doxyfile

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index bc6ff471ec403e22e6f2e1698ed35211eedee2f2..797b8865614769d90672b86912e476d32ce75218 100644 (file)
--- 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
 == 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 \
 
     $ 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).
 
 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.
 
 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:
 
 `<babeltrace/logging.h>`::
     Public header which a library user can use to control and read
 
 `<babeltrace/logging.h>`::
     Public header which a library user can use to control and read

-    libbabeltrace's current log level.
+    libbabeltrace2's current log level.

 
 `<babeltrace/logging-internal.h>`::
     Internal, generic logging API which you can use in any Babeltrace
 
 `<babeltrace/logging-internal.h>`::
     Internal, generic logging API which you can use in any Babeltrace


@@ -362,7 +362,7 @@ before it includes `<babeltrace/logging-internal.h>`. In plugins, for
 example, there is one log level per component class, which makes log
 filtering easier during execution.
 +
 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:
 +
 --
 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
   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]]
 
 
 [[logging-instrument-source]]

diff --git a/Makefile.am b/Makefile.am
index 475b31a4d7bcabbe273af9680f262044ee68a819..33abcf8b71d980d4742e5f5ee8d8bee7dcb11190 100644 (file)
--- 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
 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
 
 # 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 (file)
index 8237607..0000000
--- 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/babeltrace.pc.in b/babeltrace.pc.in
deleted file mode 100644 (file)
index 7c33f28..0000000
--- a/babeltrace.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Babeltrace
-Description: libbabeltrace 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} 
-

diff --git a/babeltrace2-ctf.pc.in b/babeltrace2-ctf.pc.in
new file mode 100644 (file)
index 0000000..b20d98b
--- /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/babeltrace2.pc.in b/babeltrace2.pc.in
new file mode 100644 (file)
index 0000000..646aeb4
--- /dev/null
+++ b/babeltrace2.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Babeltrace
+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} -lbabeltrace2
+Cflags: -I${includedir}
+

diff --git a/bindings/python/bt2/Makefile.am b/bindings/python/bt2/Makefile.am
index 44e96441116d124633e17b3838fff19f577b81a3..428588e849bed8186a41ad33bdfa0db869f18166 100644 (file)
--- 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
 # 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
 
 # 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 de4f0a014682e227aea7c97e92d1185c3061447a..aeeac8f7f00dd18ef58d5156c0c01e6c671b6f80 100644 (file)
--- 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'],
 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@',
 
     dist = setup(name='bt2',
             version='@PACKAGE_VERSION@',

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 1ae510496ce27da468fb0a3cf75dd8a56af8a663..6a7cc8816d19cf77eb92b4b8f4282c47db0293f6 100644 (file)
--- 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 = \
 # 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)/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
        $(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 \
 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)"'
 
        $(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 ce0b661a81bece453b0a906628f1a6fede027e8f..75247fcd59e390390266050eac896b09492d3a37 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\"
 
 
 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 20f0345682ae8d3cd03a27c2f84af2c2c596bad9..dbc46cbbcadab253519d008e2ce27d8540a5468a 100644 (file)
--- 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([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)])
 
 # 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
        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])
 ])
 
 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_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])
 PPRINT_PROP_STRING([Configuration], [$report_sysconfdif])

diff --git a/ctfser/Makefile.am b/ctfser/Makefile.am
index 21e605af0cf8bfa0c88780ede90d679c9a9b6e1a..717621ac76bb6c8c3a23003087b5c81069693569 100644 (file)
--- a/ctfser/Makefile.am
+++ b/ctfser/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\"
 
 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 505ef8d21521c79f9f57fd92b2c30ee927203c28..9bc55df57e18c8c4d6842e4aba0aeb6c13eea62c 100644 (file)
--- a/fd-cache/Makefile.am
+++ b/fd-cache/Makefile.am
@@ -1,8 +1,8 @@
 AM_CPPFLAGS += -DINSTALL_LIBDIR=\"$(libdir)\"
 
 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
        fd-cache.c \
        logging.c \
        logging.h

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1b4d0c119a976b3930bd4d47b754234317f888f5..fe6b88b0b993546cb4f50b60a35d047e297da98a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,45 +1,48 @@
 SUBDIRS = trace-ir ctf-writer prio_heap plugin graph .
 
 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
        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)
 
                        -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 \
        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
        $(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
 
 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
 # 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)
 
                        -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 \
        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
        $(top_builddir)/compat/libcompat.la

diff --git a/lib/babeltrace.c b/lib/babeltrace.c
deleted file mode 100644 (file)
index 1623b6e..0000000
--- a/lib/babeltrace.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
- *
- * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/version.h>
-#include <babeltrace/types.h>
-#include <stdlib.h>
-
-int bt_version_get_major(void)
-{
-       return BT_VERSION_MAJOR;
-}
-
-int bt_version_get_minor(void)
-{
-       return BT_VERSION_MINOR;
-}
-
-int bt_version_get_patch(void) {
-       return BT_VERSION_PATCH;
-}
-
-const char *bt_version_get_extra(void)
-{
-       return BT_VERSION_EXTRA;
-}

diff --git a/lib/babeltrace2.c b/lib/babeltrace2.c
new file mode 100644 (file)
index 0000000..1623b6e
--- /dev/null
+++ b/lib/babeltrace2.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/version.h>
+#include <babeltrace/types.h>
+#include <stdlib.h>
+
+int bt_version_get_major(void)
+{
+       return BT_VERSION_MAJOR;
+}
+
+int bt_version_get_minor(void)
+{
+       return BT_VERSION_MINOR;
+}
+
+int bt_version_get_patch(void) {
+       return BT_VERSION_PATCH;
+}
+
+const char *bt_version_get_extra(void)
+{
+       return BT_VERSION_EXTRA;
+}

diff --git a/lib/plugin/plugin.c b/lib/plugin/plugin.c
index 7f00d69c68cbe3697f662fc7aa4a819914260098..9f0bc2ac22efdba4f4299e89690de6575b6224a1 100644 (file)
--- a/lib/plugin/plugin.c
+++ b/lib/plugin/plugin.c
@@ -46,7 +46,7 @@
 #include <ftw.h>
 #include <pthread.h>
 
 #include <ftw.h>
 #include <pthread.h>
 

-#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)
 
 #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 be2cc1507e2c3700cc2f3e44ada743935a468bd9..559ea22fd1f3227b254b1eccc4731d0adc759b1a 100644 (file)
--- 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 3577090dbc9c56f3b587f01f2f64aab096e0f299..5f5c859d0c5d638a3f7256b3e6efe2b3fb8caacf 100644 (file)
--- 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 = \
        -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 += \
 
 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
 endif

diff --git a/plugins/ctf/common/Makefile.am b/plugins/ctf/common/Makefile.am
index 5b70fb4f163a96b6d5b099abc85e7ab8b904adba..055355b115d6b42d02c5832e95cf382087d944c4 100644 (file)
--- a/plugins/ctf/common/Makefile.am
+++ b/plugins/ctf/common/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = metadata bfcr msg-iter utils
 
 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                 \
        $(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 3139ec5050f7635cb70c0f3440e64858731ef09a..6035b1a1acfaa5e7b2fc05c756390e1b533d8c70 100644 (file)
--- 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 \
        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 352f76348df25f4abcfd361e5cf4059d83ed70b3..012f4eb9ad0afe62bb9490736ff9b967e01c8d71 100644 (file)
--- a/plugins/ctf/fs-src/Makefile.am
+++ b/plugins/ctf/fs-src/Makefile.am
@@ -1,8 +1,8 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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 \
        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 f69bb8e296c028da7fd0aa9f9ab07afb66004db4..aecd839191b93ec0cba83a89c445ed9a74f709ab 100644 (file)
--- a/plugins/ctf/lttng-live/Makefile.am
+++ b/plugins/ctf/lttng-live/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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 \
                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
                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
 
 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 969e296e3648a04a1c5d6334992ede1d004eb644..1d555a55544964997f4b61854a1d4cfab1c4b29e 100644 (file)
--- 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 += \
 
 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
 endif

diff --git a/plugins/lttng-utils/debug-info/Makefile.am b/plugins/lttng-utils/debug-info/Makefile.am
index e1ff7d7eeedd476421d7e45883d9e6362df29b5f..0dea0a463941195b6028a22f48b32a2630b0883e 100644 (file)
--- 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 = \
 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 \
 
 libdebug_info_la_SOURCES = \
        bin-info.c \

diff --git a/plugins/text/Makefile.am b/plugins/text/Makefile.am
index f7bfff8e900da02b176db1fe85d4207e97f2bf36..c9b26c26d21546a2f180e4206c04689712382a75 100644 (file)
--- 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 = \
        -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 += \
 
 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
        $(top_builddir)/compat/libcompat.la
 endif

diff --git a/plugins/text/dmesg/Makefile.am b/plugins/text/dmesg/Makefile.am
index 7e63cf72a3217abdda11ba5c53a4cdc2b704486f..6e0f12adcfb502b2c50f5a9e23d86f5d3dfe67ee 100644 (file)
--- a/plugins/text/dmesg/Makefile.am
+++ b/plugins/text/dmesg/Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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
 
 # ctf-text plugin

-libbabeltrace_plugin_text_dmesg_cc_la_SOURCES = \
+libbabeltrace2_plugin_text_dmesg_cc_la_SOURCES = \

        dmesg.c \
        dmesg.h \
        logging.h \
        dmesg.c \
        dmesg.h \
        logging.h \

diff --git a/plugins/text/pretty/Makefile.am b/plugins/text/pretty/Makefile.am
index 7af0f29d5c59891901db627ada2d71a184908d20..72c0ab10634a05bbd32aa78c98daa646502f7dcd 100644 (file)
--- a/plugins/text/pretty/Makefile.am
+++ b/plugins/text/pretty/Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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
 
 # ctf-text plugin

-libbabeltrace_plugin_text_pretty_cc_la_SOURCES = \
+libbabeltrace2_plugin_text_pretty_cc_la_SOURCES = \

        logging.c \
        logging.h \
        pretty.c \
        logging.c \
        logging.h \
        pretty.c \

diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am
index 7458909b75379b965f9da93c23ef9c757b2b9a60..9211dd9e6a920a8af0f4c53368251a6749c304aa 100644 (file)
--- 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 = \
        $(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 += \
 
 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
 endif

diff --git a/plugins/utils/counter/Makefile.am b/plugins/utils/counter/Makefile.am
index 789df18643466e732468a82a1615aab33c85ae68..67d1656d86f02afac6da12bb01265b340f749ffd 100644 (file)
--- a/plugins/utils/counter/Makefile.am
+++ b/plugins/utils/counter/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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 \
        counter.c \
        counter.h \
        logging.c \

diff --git a/plugins/utils/dummy/Makefile.am b/plugins/utils/dummy/Makefile.am
index 107f0feb774c2c5c90176a47ed619606df65950d..197aaa128c8e93e6b9833e666b4cbe00ba3b6c1e 100644 (file)
--- a/plugins/utils/dummy/Makefile.am
+++ b/plugins/utils/dummy/Makefile.am
@@ -1,4 +1,4 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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 a85c8fbeec1999970fab19f9472a79f8669d9c1e..9c305bcde0d6ae54c8cf8e1f30c01882d8b54b82 100644 (file)
--- a/plugins/utils/muxer/Makefile.am
+++ b/plugins/utils/muxer/Makefile.am
@@ -1,4 +1,4 @@
 AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 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 26917bde765f5c20d2d694d5641fa3a46dd82e67..050db0c43cd2dd4936b930a71f4d0551856ec906 100644 (file)
--- 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
 
 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 \
        trimmer.c \
        trimmer.h \
        logging.c \

diff --git a/python-plugin-provider/Makefile.am b/python-plugin-provider/Makefile.am
index 840938811bafa6f573cc412fc9ad78fd4aedd309..294629e34d39371a76d79f16b79b5101d913e395 100644 (file)
--- a/python-plugin-provider/Makefile.am
+++ b/python-plugin-provider/Makefile.am
@@ -1,19 +1,19 @@
 AM_CPPFLAGS += $(PYTHON_INCLUDE)
 
 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
        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)
 
        $(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
 
 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
 endif

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 444654f98a634b379458d995af636749ebc5096b..e4930d8802709d5b4b98ca064261a11a86164ca2 100644 (file)
--- 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 \
 # 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
 
 
 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 5bb34ca0f5eedfdd0f7230604b4fdb51306bc9a8..3a185b27fea80273faff1daee74e4cf0ef4cd0a8 100644 (file)
--- 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 = \
        $(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
 
 # 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 = \
        $(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 8744e8ae32fe771aed65d89920a77a7e46244c25..b5d584b72f2ebcadc8f7196bf370b01895d44afe 100644 (file)
--- 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 \
 
 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 \
        $(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
        $(ELFUTILS_LIBS) \
        $(LIBTAP)
 test_bin_info_SOURCES = test_bin_info.c