From: David Goulet <dgoulet@efficios.com>
Date: Fri, 10 Feb 2012 22:23:45 +0000 (-0500)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8afbfed3474bb6de6534a5cf453ade6625ca985d;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

8afbfed3474bb6de6534a5cf453ade6625ca985d
diff --cc Makefile.am
index b6c5a7a0d,831ac9d29..bab695466
--- a/Makefile.am
+++ b/Makefile.am
@@@ -7,5 -5,4 +7,7 @@@ SUBDIRS = src/common/ 
  		  include \
  		  doc
  
 +bench:
 +	./benchmark/runall.sh
++
+ dist_doc_DATA = ChangeLog
diff --cc configure.ac
index bd65c55ee,ffd54e2e6..0a1cc319c
--- a/configure.ac
+++ b/configure.ac
@@@ -137,8 -150,8 +155,9 @@@ AC_SUBST(DEFAULT_INCLUDES
  AC_CONFIG_FILES([
  	Makefile
  	doc/Makefile
+ 	doc/man/Makefile
  	include/Makefile
 +	benchmark/Makefile
  	src/Makefile
  	src/common/Makefile
  	src/common/kernel-ctl/Makefile