Merge branch 'master' into bindings/python

[babeltrace.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8c6a20b60607b38c205d8a1adbea818767f2f263..e4562869ae1de93909c82cf64dc475491c112e4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /tests/test-bitfield
+*~
 /tests/lib/test-seeks
 *.o
 *.a
@@ -16,7 +17,12 @@ ctf-parser-test
 /config.h.in
 /config.status
 *.log
-*.m4
+aclocal.m4
+/m4/libtool.m4
+/m4/lt~obsolete.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
 libtool
 /configure
 Makefile
@@ -27,3 +33,6 @@ converter/babeltrace-log
 core
 formats/ctf/metadata/ctf-parser.output
 stamp-h1
+bindings/python/babeltrace.i
+bindings/python/babeltrace.py
+bindings/python/babeltrace_wrap.c