X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=.gitignore;h=acceec5ede434b8d1c42ce6b5f89dd0845efb66f;hb=fa184a4dbf3ee0ac1cc1001566031abbc7866f87;hp=12ec06c09df19ba79004781e8d5f2ed90911dba5;hpb=d0e8dd3951870f4341b50598afd0fd7c42516866;p=lttng-ust.git

diff --git a/.gitignore b/.gitignore
index 12ec06c0..acceec5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,8 +71,10 @@ cscope.*
 /doc/man/lttng-ust.3
 /doc/man/tracef.3
 /doc/man/tracelog.3
-/doc/man/vtracef.3
-/doc/man/vtracelog.3
+/doc/man/lttng_ust_tracef.3
+/doc/man/lttng_ust_tracelog.3
+/doc/man/lttng_ust_vtracef.3
+/doc/man/lttng_ust_vtracelog.3
 
 /tests/benchmark/bench1
 /tests/benchmark/bench2
@@ -100,6 +102,16 @@ cscope.*
 /tests/compile/api1/test-app-ctx/hello-compatapi1
 /tests/compile/api1/ust-fields/ust-fields
 /tests/compile/api1/ust-fields/ust-fields-compatapi1
+/tests/regression/abi0-conflict/app_noust
+/tests/regression/abi0-conflict/app_noust_dlopen
+/tests/regression/abi0-conflict/app_noust_indirect_abi0
+/tests/regression/abi0-conflict/app_noust_indirect_abi0_abi1
+/tests/regression/abi0-conflict/app_noust_indirect_abi1
+/tests/regression/abi0-conflict/app_ust
+/tests/regression/abi0-conflict/app_ust_dlopen
+/tests/regression/abi0-conflict/app_ust_indirect_abi0
+/tests/regression/abi0-conflict/app_ust_indirect_abi0_abi1
+/tests/regression/abi0-conflict/app_ust_indirect_abi1
 /tests/unit/gcc-weak-hidden/test_gcc_weak_hidden
 /tests/unit/libmsgpack/test_msgpack
 /tests/unit/libringbuffer/test_shm
@@ -121,9 +133,14 @@ cscope.*
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/classnoinst.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/log4j-jni-header.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/META-INF
 /src/lib/lttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h
 /src/lib/lttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h
 /src/lib/lttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h
+/src/lib/lttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j2_LttngLog4j2Api.h
 /src/lib/lttng-ust-java/classnoinst.stamp
 /src/lib/lttng-ust-java/jni-header.stamp
 
@@ -141,6 +158,7 @@ cscope.*
 /doc/Makefile
 /doc/examples/Makefile
 /doc/man/Makefile
+/extras/Makefile
 /include/Makefile
 /src/common/Makefile
 /src/lib/lttng-ust-common/Makefile
@@ -155,10 +173,12 @@ cscope.*
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/Makefile
 /src/lib/lttng-ust-java-agent/jni/Makefile
 /src/lib/lttng-ust-java-agent/jni/common/Makefile
 /src/lib/lttng-ust-java-agent/jni/jul/Makefile
 /src/lib/lttng-ust-java-agent/jni/log4j/Makefile
+/src/lib/lttng-ust-java-agent/jni/log4j2/Makefile
 /src/lib/lttng-ust-java/Makefile
 /src/lib/lttng-ust-libc-wrapper/Makefile
 /src/lib/lttng-ust-pthread-wrapper/Makefile
@@ -184,6 +204,8 @@ cscope.*
 /tests/compile/api1/hello/Makefile
 /tests/compile/api1/same_line_tracepoint/Makefile
 /tests/compile/api1/test-app-ctx/Makefile
+/tests/regression/abi0-conflict/Makefile
+/tests/regression/Makefile
 /tests/unit/Makefile
 /tests/unit/gcc-weak-hidden/Makefile
 /tests/unit/libmsgpack/Makefile
@@ -195,3 +217,4 @@ cscope.*
 /tests/unit/ust-utils/Makefile
 /tests/utils/Makefile
 /tools/Makefile
+/bin/