X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=751fa0ebd245080be46afa822a5056c6df777abb;hb=405f9e7db1cd7c023614ae249f0705fbb3da514c;hp=b5875cd6686574b9d33efd5fc96df3005d9dc9e7;hpb=df08d338ff7f7ced42ba49530617b06a73678669;p=lttng-tools.git

diff --git a/include/Makefile.am b/include/Makefile.am
index b5875cd66..751fa0ebd 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -74,7 +74,7 @@ version.i:
 	fi; \
 	echo "#define EXTRA_VERSION_NAME \"`$(SED) -n '1p' "$(top_srcdir)/version/extra_version_name" 2> /dev/null`\"" >> version.i.tmp; \
 	echo "#define EXTRA_VERSION_DESCRIPTION \"`$(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.,]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' "$(top_srcdir)/version/extra_version_description" 2> /dev/null`\"" >> version.i.tmp; \
-	echo "#define EXTRA_VERSION_PATCHES \"`ls --ignore='README' -1 "$(top_srcdir)/version/extra_patches" | $(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' 2> /dev/null`\"" >> version.i.tmp; \
+	echo "#define EXTRA_VERSION_PATCHES \"`ls -1 "$(top_srcdir)/version/extra_patches" | $(GREP) -v '^README' | $(SED) -E ':a ; N ; $$!ba ; s/[^a-zA-Z0-9 \n\t\.]/-/g ; s/\r{0,1}\n/\\\n\\\t/g' 2> /dev/null`\"" >> version.i.tmp; \
 	if test ! -f version.i || \
 			test x"`cat version.i.tmp`" != x"`cat version.i`"; then \
 		mv version.i.tmp version.i; \
@@ -103,6 +103,8 @@ lttnginclude_HEADERS = \
 	lttng/channel.h \
 	lttng/domain.h \
 	lttng/event.h \
+	lttng/event-expr.h \
+	lttng/event-field-value.h \
 	lttng/handle.h \
 	lttng/session.h \
 	lttng/lttng-error.h \
@@ -132,6 +134,7 @@ lttngactioninclude_HEADERS= \
 lttngconditioninclude_HEADERS= \
 	lttng/condition/condition.h \
 	lttng/condition/buffer-usage.h \
+	lttng/condition/on-event.h \
 	lttng/condition/session-consumed-size.h \
 	lttng/condition/session-rotation.h \
 	lttng/condition/evaluation.h
@@ -145,9 +148,10 @@ lttngtriggerinclude_HEADERS= \
 
 lttngeventruleinclude_HEADERS= \
 	lttng/event-rule/event-rule.h \
-	lttng/event-rule/kprobe.h \
+	lttng/event-rule/kernel-probe.h \
 	lttng/event-rule/syscall.h \
-	lttng/event-rule/uprobe.h
+	lttng/event-rule/userspace-probe.h \
+	lttng/event-rule/tracepoint.h
 
 noinst_HEADERS = \
 	lttng/snapshot-internal.h \
@@ -163,6 +167,7 @@ noinst_HEADERS = \
 	lttng/action/stop-session-internal.h \
 	lttng/condition/condition-internal.h \
 	lttng/condition/buffer-usage-internal.h \
+	lttng/condition/on-event-internal.h \
 	lttng/condition/session-consumed-size-internal.h \
 	lttng/condition/evaluation-internal.h \
 	lttng/condition/session-rotation-internal.h \
@@ -171,7 +176,10 @@ noinst_HEADERS = \
 	lttng/endpoint-internal.h \
 	lttng/notification/channel-internal.h \
 	lttng/channel-internal.h \
+	lttng/domain-internal.h \
 	lttng/event-internal.h \
+	lttng/event-expr-internal.h \
+	lttng/event-field-value-internal.h \
 	lttng/rotate-internal.h \
 	lttng/ref-internal.h \
 	lttng/location-internal.h \
@@ -180,8 +188,9 @@ noinst_HEADERS = \
 	lttng/session-descriptor-internal.h \
 	lttng/kernel-probe-internal.h \
 	lttng/event-rule/event-rule-internal.h \
-	lttng/event-rule/kprobe-internal.h \
+	lttng/event-rule/kernel-probe-internal.h \
 	lttng/event-rule/syscall-internal.h \
-	lttng/event-rule/uprobe-internal.h \
+	lttng/event-rule/userspace-probe-internal.h \
+	lttng/event-rule/tracepoint-internal.h \
 	version.h \
 	version.i