X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b4f1e915a68821b5b1c4e7388bdd946e9d37f958;hb=67d2ce028c96b6a3b3614b393d8928663bce4490;hp=dbc46cbbcadab253519d008e2ce27d8540a5468a;hpb=a12f3d624772f543137e60252101871cd6017a06;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index dbc46cbb..b4f1e915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,17 +36,22 @@ AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch)
+m4_define([bt_lib_version_current], [0])
+m4_define([bt_lib_version_revision], [0])
+m4_define([bt_lib_version_age], [0])
+m4_define([bt_lib_version], bt_lib_version_current[:]bt_lib_version_revision[:]bt_lib_version_age)
+
+AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version)
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
-AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace library major version])
-AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace library minor version])
-AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace library patch version])
-AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra version])
+AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version])
+AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version])
+AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace patch version])
+AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace extra version])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -727,6 +732,7 @@ AC_CONFIG_FILES([
 	bindings/python/bt2/bt2/__init__.py
 	common/Makefile
 	ctfser/Makefile
+	ctf-writer/Makefile
 	compat/Makefile
 	cli/Makefile
 	doc/Makefile
@@ -744,7 +750,6 @@ AC_CONFIG_FILES([
 	lib/graph/Makefile
 	lib/graph/message/Makefile
 	lib/trace-ir/Makefile
-	lib/ctf-writer/Makefile
 	include/Makefile
 	logging/Makefile
 	bindings/Makefile
@@ -755,8 +760,6 @@ AC_CONFIG_FILES([
 	tests/utils/Makefile
 	tests/utils/tap/Makefile
 	tests/plugins/Makefile
-	extras/Makefile
-	extras/valgrind/Makefile
 	plugins/Makefile
 	plugins/ctf/Makefile
 	plugins/ctf/common/Makefile
@@ -779,7 +782,7 @@ AC_CONFIG_FILES([
 	plugins/lttng-utils/Makefile
 	plugins/lttng-utils/debug-info/Makefile
 	babeltrace2.pc
-	babeltrace2-ctf.pc
+	babeltrace2-ctf-writer.pc
 ])
 
 AC_CONFIG_FILES([tests/cli/test_intersection], [chmod +x tests/cli/test_intersection])
@@ -792,7 +795,6 @@ AC_CONFIG_FILES([tests/cli/test_trimmer], [chmod +x tests/cli/test_trimmer])
 AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete])
 AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugin_complete])
 AC_CONFIG_FILES([tests/lib/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir])
-AC_CONFIG_FILES([tests/lib/ctf-writer/test_ctf_writer], [chmod +x tests/lib/ctf-writer/test_ctf_writer])
 AC_CONFIG_FILES([tests/plugins/ctf/test_ctf_plugin], [chmod +x tests/plugins/ctf/test_ctf_plugin])
 AC_CONFIG_FILES([tests/plugins/test_utils_muxer_complete], [chmod +x tests/plugins/test_utils_muxer_complete])
 AC_CONFIG_FILES([tests/plugins/test_lttng_utils_debug_info], [chmod +x tests/plugins/test_lttng_utils_debug_info])
@@ -809,7 +811,6 @@ AS_IF([test "x$enable_python_bindings" = xyes],
   [
 	AC_CONFIG_FILES([tests/bindings/python/bt2/test_python_bt2], [chmod +x tests/bindings/python/bt2/test_python_bt2])
 	AC_CONFIG_FILES([tests/utils/test_python_bt2_env], [chmod +x tests/utils/test_python_bt2_env])
-	AC_CONFIG_FILES([tests/bindings/python/babeltrace/test_python_babeltrace], [chmod +x tests/bindings/python/babeltrace/test_python_babeltrace])
   ]
 )