<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body>
This patch need to be split to backport the save-load fix part up to
2.5.<br>
<br>
Patch set incoming shortly<br>
<br>
Cheers!<br>
<br>
<br>
<div class="moz-cite-prefix">On 15-01-28 05:08 PM, Jonathan Rajotte
wrote:<br>
</div>
<blockquote
cite="mid:CAF4oYfEmqYYyE02d9+dZeXZkXs0j1kQBwWR8Dp8ry6GMdbuV7g@mail.gmail.com"
type="cite">
<div dir="ltr"><br>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Wed, Jan 28, 2015 at 4:57 PM,
Jérémie Galarneau <span dir="ltr"><<a
moz-do-not-send="true"
href="mailto:jeremie.galarneau@efficios.com"
target="_blank">jeremie.galarneau@efficios.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex"><span class="">On Wed,
Jan 28, 2015 at 4:45 PM, Jonathan Rajotte<br>
<<a moz-do-not-send="true"
href="mailto:jonathan.rajotte-julien@efficios.com">jonathan.rajotte-julien@efficios.com</a>>
wrote:<br>
> Signed-off-by: Jonathan Rajotte <<a
moz-do-not-send="true"
href="mailto:jonathan.rajotte-julien@efficios.com">jonathan.rajotte-julien@efficios.com</a>><br>
> ---<br>
> src/common/Makefile.am | 14 ++++++++++++++<br>
> src/common/config/Makefile.am | 14 ++++++++++++++<br>
> 2 files changed, 28 insertions(+)<br>
><br>
> diff --git a/src/common/Makefile.am
b/src/common/Makefile.am<br>
> index 3a2f4f0..97d0ecc 100644<br>
> --- a/src/common/Makefile.am<br>
> +++ b/src/common/Makefile.am<br>
> @@ -41,3 +41,17 @@ if HAVE_LIBLTTNG_UST_CTL<br>
> libconsumer_la_LIBADD += \<br>
>
$(top_builddir)/src/common/ust-consumer/<a
moz-do-not-send="true"
href="http://libust-consumer.la" target="_blank">libust-consumer.la</a><br>
> endif<br>
> +<br>
> +all-local:<br>
> + @if [ x"$(srcdir)" != x"$(builddir)" ];
then \<br>
> + for script in $(EXTRA_DIST); do \<br>
<br>
</span>Just curious, why name this variable "script"?<br>
</blockquote>
<div><br>
</div>
<div>Mostly to be consistent across all makefile concerning
the copy of EXTRA_DIST to the $build_dir when doing out of
tree build and distribution build.<br>
<br>
</div>
<div>You can run grep -rnw ./ -e " EXTRA_DIST" in tools
directory to see the current trend of using script for
naming the temp file variable.<br>
<br>
</div>
<div>I don't mind renaming it if you find it ambiguous.<br>
<br>
</div>
<div>Cheers!<br>
<br>
</div>
<div>Jonathan<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
<br>
Jérémie<br>
<div class="">
<div class="h5"><br>
> + cp -f $(srcdir)/$$script
$(builddir); \<br>
> + done; \<br>
> + fi<br>
> +<br>
> +clean-local:<br>
> + @if [ x"$(srcdir)" != x"$(builddir)" ];
then \<br>
> + for script in $(EXTRA_DIST); do \<br>
> + rm -f $(builddir)/$$script; \<br>
> + done; \<br>
> + fi<br>
> diff --git a/src/common/config/Makefile.am
b/src/common/config/Makefile.am<br>
> index 5acc89d..e36b42f 100644<br>
> --- a/src/common/config/Makefile.am<br>
> +++ b/src/common/config/Makefile.am<br>
> @@ -9,3 +9,17 @@ libconfig_la_LIBADD =
$(XML_LIBS)<br>
> xmldir = $(datadir)/xml/lttng<br>
> dist_xml_DATA = session.xsd<br>
> EXTRA_DIST = session.xsd<br>
> +<br>
> +all-local:<br>
> + @if [ x"$(srcdir)" != x"$(builddir)" ];
then \<br>
> + for script in $(EXTRA_DIST); do \<br>
> + cp -f $(srcdir)/$$script
$(builddir); \<br>
> + done; \<br>
> + fi<br>
> +<br>
> +clean-local:<br>
> + @if [ x"$(srcdir)" != x"$(builddir)" ];
then \<br>
> + for script in $(EXTRA_DIST); do \<br>
> + rm -f $(builddir)/$$script; \<br>
> + done; \<br>
> + fi<br>
> --<br>
> 1.9.1<br>
><br>
<br>
<br>
<br>
</div>
</div>
<span class=""><font color="#888888">--<br>
Jérémie Galarneau<br>
EfficiOS Inc.<br>
<a moz-do-not-send="true"
href="http://www.efficios.com" target="_blank">http://www.efficios.com</a><br>
</font></span>
<div class="">
<div class="h5"><br>
_______________________________________________<br>
lttng-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:lttng-dev@lists.lttng.org">lttng-dev@lists.lttng.org</a><br>
<a moz-do-not-send="true"
href="http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev"
target="_blank">http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev</a><br>
</div>
</div>
</blockquote>
</div>
<div dir="ltr">
<div>
<div dir="ltr">
<div><br>
</div>
</div>
</div>
</div>
</div>
</div>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Jonathan R. Julien
Efficios</pre>
</body>
</html>