X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=767b05b5d99ff38128713925a7dbd71e12579bd7;hb=ed343076683ad0b7b7aaa557e30f97429efb82f3;hp=9d00bee4ecb79d73bf49dbb029106798ddaee7c2;hpb=1239a312e7e0e4c33948fdaf04e7637cb93c8b10;p=lttng-tools.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 9d00bee4e..767b05b5d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,7 +9,7 @@ version.h:
 	## the locations of the version.h and version.h.tmpl files
 	##
 	@echo -n "Generating version.h ... "
-	@(version_h_tmpl="$(top_builddir)/include/version.h.tmpl"; \
+	@(version_h_tmpl="$(top_srcdir)/include/version.h.tmpl"; \
 	if [ -f "$${version_h_tmpl}" ]; then \
 		version_h="$(top_builddir)/include/version.h"; \
 		##
@@ -21,8 +21,7 @@ version.h:
 			git_version=""; \
 		else \
 			git_describe="$$(git describe)"; \
-			if [ "$${git_branch}" == "$${git_describe}" ] || \
-				[ "$${git_branch}" == "heads/master" ]; then \
+			if [ "$${git_branch}" == "$${git_describe}" ]; then \
 				git_version="$${git_describe}"; \
 			else \
 				git_version="$$(git describe --long --all)"; \
@@ -46,20 +45,8 @@ version.h:
 			## 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 \
-				if [ $$(grep -c "^#define GIT_VERSION" "$${version_h}") -gt 0 ]; then \
-					##
-					## If there is already a GIT_VERSION defined,
-					## we just replace it by the new version
-					##
-					sed -i "s'^#define GIT_VERSION.*$$'#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \
-				else \
-					##
-					## Else, we add a GIT_VERSION define
-					## containing our new version.
-					##
-					sed -i "s'^\(#define VERSION_H.*\)$$'\1\n\n#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \
-				fi; \
+			if [ $$(grep -cE "^#define GIT_VERSION_SED \"?$${git_version}\"?$$" "$${version_h}") -eq 0 ]; then \
+				sed -i "s'^#define GIT_VERSION_SED.*$$'#define GIT_VERSION \"$${git_version}\"'" "$${version_h}"; \
 			fi; \
 		fi; \
 	fi)
@@ -83,9 +70,11 @@ lttnginclude_HEADERS = \
 	lttng/lttng-error.h \
 	lttng/snapshot.h \
 	lttng/save.h \
+	lttng/load.h \
 	version.h
 
 noinst_HEADERS = \
 	lttng/snapshot-internal.h \
 	lttng/health-internal.h \
-	lttng/save-internal.h
+	lttng/save-internal.h \
+	lttng/load-internal.h