Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Subject: [lttng-dev] [PATCH urcu] Fix: typo CPPLAGS in examples Makefile
Date: Mon, 22 Apr 2019 12:11:43 -0400 (EDT)	[thread overview]
Message-ID: <1495030212.302.1555949503267.JavaMail.zimbra@efficios.com> (raw)
In-Reply-To: <20190422160404.10274-1-mjeanson@efficios.com>

Hi,

Merged into master, and backported to 0.10 and 0.9, thanks!

Mathieu

----- On Apr 22, 2019, at 12:04 PM, Michael Jeanson mjeanson at efficios.com wrote:

> Overriding CPPFLAGS throught the environment was ignored for the
> examples.
> 
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> doc/examples/Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
> index 3c3d152..edf00eb 100644
> --- a/doc/examples/Makefile.am
> +++ b/doc/examples/Makefile.am
> @@ -141,7 +141,7 @@ all-local:
> 	else \
> 		rel_build_subdir="../"; \
> 	fi; \
> -	$(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)"
> AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/"
> -I"$${rel_src_subdir}/$(top_srcdir)/src/"
> -I"$${rel_build_subdir}$(top_builddir)/include/"
> -I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)"
> AM_CFLAGS="$(AM_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS)
> -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" AM_V_P="$(AM_V_P)"
> AM_V_at="$(AM_V_at)" $(AM_MAKEFLAGS) all;
> +	$(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPFLAGS)"
> AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/"
> -I"$${rel_src_subdir}/$(top_srcdir)/src/"
> -I"$${rel_build_subdir}$(top_builddir)/include/"
> -I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)"
> AM_CFLAGS="$(AM_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS)
> -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" AM_V_P="$(AM_V_P)"
> AM_V_at="$(AM_V_at)" $(AM_MAKEFLAGS) all;
> 
> clean-local:
> 	$(AM_V_at)$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \
> --
> 2.17.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com


      reply	other threads:[~2019-04-22 16:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-22 16:04 Michael Jeanson
2019-04-22 16:11 ` Mathieu Desnoyers [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495030212.302.1555949503267.JavaMail.zimbra@efficios.com \
    --to=mathieu.desnoyers@efficios.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox