Merge branch 'master' into bindings/python
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 16 Jan 2013 22:56:46 +0000 (17:56 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 16 Jan 2013 22:56:46 +0000 (17:56 -0500)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
1  2 
.gitignore
Makefile.am
README
configure.ac

diff --cc .gitignore
index d7b0ca1bead3f24a66be024f672a83088e5d4821,8c6a20b60607b38c205d8a1adbea818767f2f263..e4562869ae1de93909c82cf64dc475491c112e4a
@@@ -1,5 -1,5 +1,6 @@@
  /tests/test-bitfield
 +*~
+ /tests/lib/test-seeks
  *.o
  *.a
  *.la
diff --cc Makefile.am
index 6584c5d2985c8498b01b63db94c9a0fd0c7829fd,b25b58fe3e4fa002e4cf361ebcc648f88d7cc95f..d28fbc0f78f2e233e172bfc5b774c40eb0ae6011
@@@ -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 README
Simple merge
diff --cc configure.ac
index 24ee2a6290046c6baac0be9ef344f6bfd865dcea,601025f7c245ab74b531c66fdc5ff9fa7dfa799a..aab61999ecf32229c65b4ae23dbabda58bb31066
@@@ -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
This page took 0.035425 seconds and 4 git commands to generate.