From: Mathieu Desnoyers Date: Mon, 26 Aug 2013 17:34:48 +0000 (-0400) Subject: Merge branch 'master' into bindings/python X-Git-Tag: v1.2.0-rc1~74 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=ccde9b25397f3e74c60bfbcb9f77008299a44cc9 Merge branch 'master' into bindings/python Signed-off-by: Mathieu Desnoyers --- ccde9b25397f3e74c60bfbcb9f77008299a44cc9 diff --cc .gitignore index c60c0e4b,2b5af7e2..782da3e9 --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,5 +1,6 @@@ +*~ - /tests/lib/test-bitfield - /tests/lib/test-seeks + /tests/lib/test_bitfield + /tests/lib/test_seek *.o *.a *.la diff --cc Makefile.am index d28fbc0f,e5eca77f..c3c64e09 --- 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 extras -SUBDIRS = include types compat lib formats converter tests doc extras ++SUBDIRS = include types compat 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 4563c35c,58a472d1..16679b84 --- a/configure.ac +++ b/configure.ac @@@ -141,10 -132,11 +167,13 @@@ AC_CONFIG_FILES( lib/Makefile lib/prio_heap/Makefile include/Makefile + bindings/Makefile + bindings/python/Makefile tests/Makefile + tests/bin/Makefile tests/lib/Makefile + tests/utils/Makefile + tests/utils/tap/Makefile extras/Makefile extras/valgrind/Makefile babeltrace.pc