* Re: [PATCH urcu] Fix: typo CPPLAGS in examples Makefile
[not found] <20190422160404.10274-1-mjeanson@efficios.com>
@ 2019-04-22 16:11 ` Mathieu Desnoyers
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2019-04-22 16:11 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev
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@efficios.com wrote:
> Overriding CPPFLAGS throught the environment was ignored for the
> examples.
>
> Signed-off-by: Michael Jeanson <mjeanson@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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH urcu] Fix: typo CPPLAGS in examples Makefile
@ 2019-04-22 16:04 Michael Jeanson
0 siblings, 0 replies; 2+ messages in thread
From: Michael Jeanson @ 2019-04-22 16:04 UTC (permalink / raw)
To: lttng-dev, mathieu.desnoyers
Overriding CPPFLAGS throught the environment was ignored for the
examples.
Signed-off-by: Michael Jeanson <mjeanson@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-22 16:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20190422160404.10274-1-mjeanson@efficios.com>
2019-04-22 16:11 ` [PATCH urcu] Fix: typo CPPLAGS in examples Makefile Mathieu Desnoyers
2019-04-22 16:04 Michael Jeanson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).