X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2FMakefile.am;h=85ffa11da55af922abb9c07f98c2c70428be3c60;hp=2da03f493b4eef18eecda6681b101195ebd2348f;hb=2ebe596e3e57e57220afae2b4499aff6348ce3a7;hpb=c19092cd4d6af49c38322fc55ca91f17f03f32ac

diff --git a/include/Makefile.am b/include/Makefile.am
index 2da03f493..85ffa11da 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -20,11 +20,21 @@
 ## overwrite the git version with an empty string in "version.i.tmp".
 ##
 ## If we don't have a "version.i.tmp" nor a "version.i", generate an empty
-## string as a failover.
+## string as a failover. If a "version.i" is present, for example when building
+## from a distribution tarball, get the git_version using grep.
 ##
-## If we don't have a "version.i" or we have both files and they are different,
-## copy "version.i.tmp" over "version.i". This way the dependent targets are
-## only rebuilt when the version string changes.
+## Fetch the EXTRA_VERSION_NAME define from "version/extra_version_name" and output it
+## to "version.i.tmp".
+##
+## Fetch the EXTRA_VERSION_DESCRIPTION define from "version/extra_version_description",
+## sanitize and format it with a sed script to replace all non-alpha-numeric values
+## with "-" and join all lines by replacing "\n" with litteral string c-style "\n\t" and
+## output it to "version.i.tmp".
+##
+## If we don't have a "version.i" or we have both files (version.i, version.i.tmp)
+## and they are different, copy "version.i.tmp" over "version.i".
+## This way the dependent targets are only rebuilt when the git version
+## string or either one of extra version string change.
 ##
 version_verbose = $(version_verbose_@AM_V@)
 version_verbose_ = $(version_verbose_@AM_DEFAULT_V@)
@@ -43,10 +53,15 @@ version.i:
 		fi; \
 	fi; \
 	if test ! -f version.i.tmp; then \
-		if test ! -f version.i; then \
-			echo '#define GIT_VERSION ""' > version.i; \
+		if test -f version.i; then \
+			$(GREP) "^#define \bGIT_VERSION\b.*" version.i > version.i.tmp; \
+		else \
+			echo '#define GIT_VERSION ""' > version.i.tmp; \
 		fi; \
-	elif test ! -f 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; \
+	if test ! -f version.i || \
 			test x"`cat version.i.tmp`" != x"`cat version.i`"; then \
 		mv version.i.tmp version.i; \
 	fi; \
@@ -82,7 +97,10 @@ lttnginclude_HEADERS = \
 	lttng/load.h \
 	lttng/endpoint.h \
 	lttng/rotation.h \
-	lttng/location.h
+	lttng/location.h \
+	lttng/userspace-probe.h \
+	lttng/session-descriptor.h \
+	lttng/destruction-handle.h
 
 lttngactioninclude_HEADERS= \
 	lttng/action/action.h \
@@ -119,8 +137,12 @@ noinst_HEADERS = \
 	lttng/endpoint-internal.h \
 	lttng/notification/channel-internal.h \
 	lttng/channel-internal.h \
+	lttng/event-internal.h \
 	lttng/rotate-internal.h \
 	lttng/ref-internal.h \
 	lttng/location-internal.h \
+	lttng/userspace-probe-internal.h \
+	lttng/session-internal.h \
+	lttng/session-descriptor-internal.h \
 	version.h \
 	version.i