X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=.gitignore;h=acceec5ede434b8d1c42ce6b5f89dd0845efb66f;hb=fa184a4dbf3ee0ac1cc1001566031abbc7866f87;hp=37d46f9fd5fcc4bbf16710abd0604b771f5110a5;hpb=9d315d6d74aac2986b10d708c864d152a0febec7;p=lttng-ust.git

diff --git a/.gitignore b/.gitignore
index 37d46f9f..acceec5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ Makefile.in
 *.info
 *.class
 cscope.*
+.dirstamp
 
 /configure
 /aclocal.m4
@@ -49,8 +50,8 @@ cscope.*
 /src/common/config.h
 /src/common/config.h.in
 /src/common/stamp-h1
-/src/lttng-ust-ctl.pc
-/src/lttng-ust.pc
+/src/lib/lttng-ust-ctl.pc
+/src/lib/lttng-ust.pc
 
 /doc/examples/demo/demo
 /doc/examples/easy-ust/sample
@@ -70,17 +71,47 @@ 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
-/tests/compile/ctf-types/ctf-types
-/tests/compile/hello.cxx/hello
-/tests/compile/hello/hello
-/tests/compile/hello-many/hello-many
-/tests/compile/same_line_tracepoint/same_line_tracepoint
-/tests/compile/test-app-ctx/hello
+/tests/compile/api0/ctf-types/ctf-types
+/tests/compile/api0/ctf-types/ctf-types-api1
+/tests/compile/api0/hello.cxx/hello
+/tests/compile/api0/hello.cxx/hello-api1
+/tests/compile/api0/hello/hello
+/tests/compile/api0/hello/hello-api1
+/tests/compile/api0/hello-many/hello-many
+/tests/compile/api0/hello-many/hello-many-api1
+/tests/compile/api0/same_line_tracepoint/same_line_tracepoint
+/tests/compile/api0/same_line_tracepoint/same_line_tracepoint_api1
+/tests/compile/api0/test-app-ctx/hello
+/tests/compile/api0/test-app-ctx/hello-api1
+/tests/compile/api1/hello.cxx/hello
+/tests/compile/api1/hello.cxx/hello-compatapi1
+/tests/compile/api1/hello/hello
+/tests/compile/api1/hello/hello-compatapi1
+/tests/compile/api1/hello-many/hello-many
+/tests/compile/api1/hello-many/hello-many-compatapi1
+/tests/compile/api1/same_line_tracepoint/same_line_tracepoint
+/tests/compile/api1/same_line_tracepoint/same_line_tracepoint_compatapi1
+/tests/compile/api1/test-app-ctx/hello
+/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
@@ -92,21 +123,26 @@ cscope.*
 /tests/unit/ust-utils/test_ust_utils_cxx
 
 # Java agent library
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/*.jar
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/classnoinst.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/context-jni-header.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/*.jar
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/classnoinst.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/jul-jni-header.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/*.jar
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar
-/src/liblttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h
-/src/liblttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h
-/src/liblttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h
-/src/liblttng-ust-java/classnoinst.stamp
-/src/liblttng-ust-java/jni-header.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/classnoinst.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/context-jni-header.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/classnoinst.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/jul-jni-header.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/*.jar
+/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
 
 # Python agent
 /src/python-lttngust/lttngust/version.py
@@ -122,43 +158,54 @@ cscope.*
 /doc/Makefile
 /doc/examples/Makefile
 /doc/man/Makefile
+/extras/Makefile
 /include/Makefile
 /src/common/Makefile
-/src/libcounter/Makefile
-/src/liblttng-ust-comm/Makefile
-/src/liblttng-ust-ctl/Makefile
-/src/liblttng-ust-cyg-profile/Makefile
-/src/liblttng-ust-dl/Makefile
-/src/liblttng-ust-fd/Makefile
-/src/liblttng-ust-fork/Makefile
-/src/liblttng-ust-java-agent/Makefile
-/src/liblttng-ust-java-agent/java/Makefile
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
-/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
-/src/liblttng-ust-java-agent/jni/Makefile
-/src/liblttng-ust-java-agent/jni/common/Makefile
-/src/liblttng-ust-java-agent/jni/jul/Makefile
-/src/liblttng-ust-java-agent/jni/log4j/Makefile
-/src/liblttng-ust-java/Makefile
-/src/liblttng-ust-libc-wrapper/Makefile
-/src/liblttng-ust-python-agent/Makefile
-/src/liblttng-ust/Makefile
-/src/libmsgpack/Makefile
-/src/libringbuffer/Makefile
+/src/lib/lttng-ust-common/Makefile
+/src/lib/lttng-ust-ctl/Makefile
+/src/lib/lttng-ust-cyg-profile/Makefile
+/src/lib/lttng-ust-dl/Makefile
+/src/lib/lttng-ust-fd/Makefile
+/src/lib/lttng-ust-fork/Makefile
+/src/lib/lttng-ust-java-agent/Makefile
+/src/lib/lttng-ust-java-agent/java/Makefile
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
+/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
+/src/lib/lttng-ust-tracepoint/Makefile
+/src/lib/lttng-ust-python-agent/Makefile
+/src/lib/Makefile
+/src/lib/lttng-ust/Makefile
 /src/python-lttngust/Makefile
-/src/snprintf/Makefile
 /src/Makefile
 /tests/Makefile
 /tests/benchmark/Makefile
 /tests/compile/Makefile
-/tests/compile/ctf-types/Makefile
-/tests/compile/hello-many/Makefile
-/tests/compile/hello.cxx/Makefile
-/tests/compile/hello/Makefile
-/tests/compile/same_line_tracepoint/Makefile
-/tests/compile/test-app-ctx/Makefile
+/tests/compile/api0/Makefile
+/tests/compile/api0/ctf-types/Makefile
+/tests/compile/api0/hello-many/Makefile
+/tests/compile/api0/hello.cxx/Makefile
+/tests/compile/api0/hello/Makefile
+/tests/compile/api0/same_line_tracepoint/Makefile
+/tests/compile/api1/Makefile
+/tests/compile/api1/ust-fields/Makefile
+/tests/compile/api1/hello-many/Makefile
+/tests/compile/api1/hello.cxx/Makefile
+/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
@@ -170,3 +217,4 @@ cscope.*
 /tests/unit/ust-utils/Makefile
 /tests/utils/Makefile
 /tools/Makefile
+/bin/