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

diff --git a/include/Makefile.am b/include/Makefile.am
index 89b084d01..ab4665d5b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,9 @@
+if LTTNG_TOOLS_BUILD_GIT_SOURCE
+GIT_DESCRIBE_CMD = (cd $(top_srcdir); git describe)
+else
+GIT_DESCRIBE_CMD = /bin/true
+endif
+
 ##
 ## The version.h file must be verified and generated or updated if the
 ## git commit id (called git version here) changed since the last build
@@ -6,59 +12,58 @@
 version.h:
 	##
 	## We first create variables for the current git version and
-	## the locations of the version.h and version.h.tmpl files
+	## the locations of the version.h and version.h.tmpl files.
 	##
-	@echo -n "Generating version.h ... "
+	@echo $(ECHO_N) "Generating version.h... $(ECHO_C)"
 	@(version_h_tmpl="$(top_srcdir)/include/version.h.tmpl"; \
 	if [ -f "$${version_h_tmpl}" ]; then \
 		version_h="$(top_builddir)/include/version.h"; \
 		##
-		## We check the git version format we will use depending on
-		## whether or not we are in the master branch or on a tag
+		## Check whether we are in a git repo.
 		##
-		git_branch="$$(git describe --all 2>/dev/null)"; \
-		if [ -z "$${git_branch}" ]; then \
-			git_version=""; \
+		git_describe="`$(GIT_DESCRIBE_CMD) 2>/dev/null`"; \
+		if [ $$? -eq 0 ]; then \
+			git_version="$${git_describe}"; \
 		else \
-			git_describe="$$(git describe)"; \
-			if [ "$${git_branch}" == "$${git_describe}" ] || \
-				[ "$${git_branch}" == "heads/master" ]; then \
-				git_version="$${git_describe}"; \
-			else \
-				git_version="$$(git describe --long --all)"; \
-			fi; \
+			git_version=""; \
 		fi; \
 		##
 		## If the version.h file doesn't exist or is not up to date,
-		## We replace it by the version.h.tmpl file
+		## We replace it by the version.h.tmpl file.
 		##
 		if [ ! -e "$${version_h}" ] || \
 			[ "$${version_h_tmpl}" -nt "$${version_h}" ]; then \
 			cp "$${version_h_tmpl}" "$${version_h}"; \
 		fi; \
-		if [ -n "$${git_version}" ]; then \
-			##
-			## We remove the leading "v" for the version number
-			##
-			git_version="$$(echo "$${git_version}" | sed -r "s/^v([0-9])/\1/")"; \
-			##
-			## If we have a git version, we verify that it isn't the same
-			## as the one currently in the file (if there is one), as we
-			## don't want to update the file if it is already up to date
-			##
-			if [ $$(grep -cE "^#define GIT_VERSION \"?$${git_version}\"?$$" "$${version_h}") -eq 0 ]; then \
-				sed -i "s'^#define GIT_VERSION.*$$'#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \
-			fi; \
+		echo $(ECHO_N) "git version: \"$${git_version}\"$(ECHO_C)"; \
+		##
+		## We verify that git_version isn't the same as the one
+		## currently in the file (if there is one), as we don't
+		## want to update the file if it is already up to date.
+		##
+		version_match='^#define GIT_VERSION.*'; \
+		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}"; \
+		else \
+			echo $(ECHO_N) " (cached)$(ECHO_C)"; \
 		fi; \
+		echo $(ECHO_N) "... $(ECHO_C)"; \
 	fi)
-	@echo "ok"
+	@echo "$(ECHO_T)ok"
 
 ##
 ## version.h is defined as a .PHONY file even if it's a real file as
-## we want our routine to be runned for each build.
+## we want our routine to be ran for each build.
 ##
 .PHONY: version.h
 
+CLEANFILES = version.h
+
+nodist_noinst_HEADERS = \
+	version.h
+
 lttnginclude_HEADERS = \
 	lttng/health.h \
 	lttng/lttng.h \
@@ -72,10 +77,40 @@ lttnginclude_HEADERS = \
 	lttng/snapshot.h \
 	lttng/save.h \
 	lttng/load.h \
-	version.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