summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d893a65)
Requires the change of priority for include file in AM_CPPFLAGS and
that the version.h file include a "system header" version.i instead of a
local version.
Enable the passing of value from version.i to a OOT build done from a distribution
tarball. Enable a packager to touch files in custom_modifications and
generate a valid version.i file to be used in a OOT build from tarball.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
AC_SUBST(AM_CFLAGS)
AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
AC_SUBST(AM_CFLAGS)
-AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+# The order in which the include folders are searched is important.
+# The top_builddir should always be searched first in the event that a build
+# time generated file is included. An example of this is the "version.i" file.
+# In a scenario where lttng-tools is built from a distribution tarball and in a
+# out-of-tree manner, the generated "version.i" has priority on the one from
+# the source (distribution tarball) and must be found first.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
AC_SUBST(AM_CPPFLAGS)
lttngincludedir="${includedir}/lttng"
AC_SUBST(AM_CPPFLAGS)
lttngincludedir="${includedir}/lttng"
version.i:
$(version_verbose)rm -f version.i.tmp; \
version.i:
$(version_verbose)rm -f version.i.tmp; \
+ if (test ! -f version.i && test -f "$(top_srcdir)/include/version.i"); then \
+ cp "$(top_srcdir)/include/version.i" version.i; \
+ fi; \
if (test -r "$(top_srcdir)/bootstrap" && test -r "$(top_srcdir)/.git") && \
test -x "`which git 2>&1;true`"; then \
GIT_VERSION_STR="`cd "$(top_srcdir)" && git describe --tags --dirty`"; \
if (test -r "$(top_srcdir)/bootstrap" && test -r "$(top_srcdir)/.git") && \
test -x "`which git 2>&1;true`"; then \
GIT_VERSION_STR="`cd "$(top_srcdir)" && git describe --tags --dirty`"; \
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/