From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 16 Jan 2013 22:56:46 +0000 (-0500)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~89
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=71dd417a2b700c2315ef9919104572df1bc83f7a

Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

71dd417a2b700c2315ef9919104572df1bc83f7a
diff --cc .gitignore
index d7b0ca1b,8c6a20b6..e4562869
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
  /tests/test-bitfield
 +*~
+ /tests/lib/test-seeks
  *.o
  *.a
  *.la
diff --cc Makefile.am
index 6584c5d2,b25b58fe..d28fbc0f
--- a/Makefile.am
+++ b/Makefile.am
@@@ -2,7 -2,7 +2,7 @@@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_s
  
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = include types lib formats converter bindings tests doc
 -SUBDIRS = include types lib formats converter tests doc extras
++SUBDIRS = include types lib formats converter bindings tests doc extras
  
  dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
  		std-ext-lib.txt
diff --cc configure.ac
index 24ee2a62,601025f7..aab61999
--- a/configure.ac
+++ b/configure.ac
@@@ -140,8 -105,10 +140,12 @@@ AC_CONFIG_FILES(
  	lib/Makefile
  	lib/prio_heap/Makefile
  	include/Makefile
 +	bindings/Makefile
 +	bindings/python/Makefile
  	tests/Makefile
+ 	tests/lib/Makefile
+ 	extras/Makefile
+ 	extras/valgrind/Makefile
+ 	babeltrace.pc
  ])
  AC_OUTPUT