X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2FMakefile.am;h=ab4665d5ba6f0d370dbed46fef9391a2c3e3faff;hp=ab966d28b5bb15f1eee43e0f255703923cd03909;hb=8abe313a6c4f251063e4b72ddd47ce8107384d71;hpb=7211318dae2e469f896ded6673ef95bb5b7f6c7b

diff --git a/include/Makefile.am b/include/Makefile.am
index ab966d28b..ab4665d5b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,7 +21,7 @@ version.h:
 		##
 		## Check whether we are in a git repo.
 		##
-		git_describe="$$($(GIT_DESCRIBE_CMD) 2>/dev/null)"; \
+		git_describe="`$(GIT_DESCRIBE_CMD) 2>/dev/null`"; \
 		if [ $$? -eq 0 ]; then \
 			git_version="$${git_describe}"; \
 		else \
@@ -45,7 +45,7 @@ version.h:
 		old_version=$$($(GREP) "$${version_match}" "$${version_h}"); \
 		new_version="#define GIT_VERSION	\"$${git_version}\""; \
 		if [ x"$${old_version}" != x"$${new_version}" ]; then \
-			$(SED) -i '' -e "s'$${version_match}'$${new_version}'" "$${version_h}"; \
+			$(SED) -i -e "s'$${version_match}'$${new_version}'" "$${version_h}"; \
 		else \
 			echo $(ECHO_N) " (cached)$(ECHO_C)"; \
 		fi; \
@@ -77,10 +77,40 @@ lttnginclude_HEADERS = \
 	lttng/snapshot.h \
 	lttng/save.h \
 	lttng/load.h \
+	lttng/endpoint.h \
+	lttng/rotation.h \
 	version.h.tmpl
 
+lttngactioninclude_HEADERS= \
+	lttng/action/action.h \
+	lttng/action/notify.h
+
+lttngconditioninclude_HEADERS= \
+	lttng/condition/condition.h \
+	lttng/condition/buffer-usage.h \
+	lttng/condition/evaluation.h
+
+lttngnotificationinclude_HEADERS= \
+	lttng/notification/channel.h \
+	lttng/notification/notification.h
+
+lttngtriggerinclude_HEADERS= \
+	lttng/trigger/trigger.h
+
 noinst_HEADERS = \
 	lttng/snapshot-internal.h \
 	lttng/health-internal.h \
 	lttng/save-internal.h \
-	lttng/load-internal.h
+	lttng/load-internal.h \
+	lttng/action/action-internal.h \
+	lttng/action/notify-internal.h \
+	lttng/condition/condition-internal.h \
+	lttng/condition/buffer-usage-internal.h \
+	lttng/condition/evaluation-internal.h \
+	lttng/notification/notification-internal.h \
+	lttng/trigger/trigger-internal.h \
+	lttng/endpoint-internal.h \
+	lttng/notification/channel-internal.h \
+	lttng/channel-internal.h \
+	lttng/rotate-internal.h \
+	lttng/ref-internal.h