X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=bd65c55ee24b033f0595a9d9a77ff25c8f8c23f3;hb=7bb1478af7d1567a6842d0fc73c46315b65bbaf7;hp=68845123cc103b3976a77dfd06a53cdd9f936065;hpb=5af3d17607cbce4ab708e633986d3d41f8d56814;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 68845123c..bd65c55ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre16],[david.goulet@polymtl.ca],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0-pre18],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -127,7 +127,7 @@ LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
 
 lttngincludedir="${includedir}/lttng"
 
@@ -136,21 +136,25 @@ AC_SUBST(DEFAULT_INCLUDES)
 
 AC_CONFIG_FILES([
 	Makefile
+	doc/Makefile
 	include/Makefile
 	benchmark/Makefile
-	common/Makefile
-	libkernelctl/Makefile
-	liblttng-consumer/Makefile
-	liblttng-kconsumer/Makefile
-	liblttng-ustconsumer/Makefile
-	liblttngctl/Makefile
-	liblttng-sessiond-comm/Makefile
-	liblttng-ht/Makefile
-	lttng-consumerd/Makefile
-	lttng-sessiond/Makefile
-	lttng/Makefile
+	src/Makefile
+	src/common/Makefile
+	src/common/kernel-ctl/Makefile
+	src/common/kernel-consumer/Makefile
+	src/common/ust-consumer/Makefile
+	src/common/hashtable/Makefile
+	src/common/sessiond-comm/Makefile
+	src/lib/Makefile
+	src/lib/lttng-ctl/Makefile
+	src/bin/Makefile
+	src/bin/lttng-consumerd/Makefile
+	src/bin/lttng-sessiond/Makefile
+	src/bin/lttng/Makefile
 	tests/Makefile
-	doc/Makefile
+	tests/ust-nevents/Makefile
+	tests/ust-nprocesses/Makefile
 ])
 
 AC_OUTPUT