Merged, thanks! Mathieu
----- On Dec 12, 2018, at 3:30 PM, Michael Jeanson mjean...@efficios.com wrote: > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > doc/examples/Makefile.examples.template | 6 ++++-- > doc/examples/dist-files/Makefile | 2 +- > doc/examples/hlist/Makefile | 2 +- > doc/examples/wfcqueue/Makefile | 2 +- > 4 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/doc/examples/Makefile.examples.template > b/doc/examples/Makefile.examples.template > index 238a5cc..e6196f5 100644 > --- a/doc/examples/Makefile.examples.template > +++ b/doc/examples/Makefile.examples.template > @@ -17,12 +17,14 @@ AM_V_P := : > all: $(BINARY) > > $(BINARY): $(OBJECTS) > - @if $(AM_V_P); then set -x; else echo " CCLD $@"; fi; \ > + @verbose="$(AM_V_P)"; if [ "x$$verbose" = "x" ]; then verbose=":"; fi; \ > + if $$verbose; then set -x; else echo " CCLD $@"; fi; \ > $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) > $(LDFLAGS) \ > -o $@ $(OBJECTS) $(LIBS) > > $(OBJECTS): $(SOURCES) $(DEPS) > - @if $(AM_V_P); then set -x; else echo " CC $@"; fi; \ > + @verbose="$(AM_V_P)"; if [ "x$$verbose" = "x" ]; then verbose=":"; fi; \ > + if $$verbose; then set -x; else echo " CC $@"; fi; \ > $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) > $(CPPFLAGS) \ > -c -o $@ $(SOURCES) > > diff --git a/doc/examples/dist-files/Makefile > b/doc/examples/dist-files/Makefile > index 08b7dcb..08f3728 100644 > --- a/doc/examples/dist-files/Makefile > +++ b/doc/examples/dist-files/Makefile > @@ -1,4 +1,4 @@ > -# Copyright (C) 2013 Mathieu Desnoyers > <mathieu.desnoyers$(AM_V_at)efficios.com> > +# Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoy...@efficios.com> > # > # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED > # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. > diff --git a/doc/examples/hlist/Makefile b/doc/examples/hlist/Makefile > index 57197a2..4256035 100644 > --- a/doc/examples/hlist/Makefile > +++ b/doc/examples/hlist/Makefile > @@ -1,4 +1,4 @@ > -# Copyright (C) 2013 Mathieu Desnoyers > <mathieu.desnoyers$(AM_V_at)efficios.com> > +# Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoy...@efficios.com> > # > # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED > # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. > diff --git a/doc/examples/wfcqueue/Makefile b/doc/examples/wfcqueue/Makefile > index d1a5a2d..4f0338e 100644 > --- a/doc/examples/wfcqueue/Makefile > +++ b/doc/examples/wfcqueue/Makefile > @@ -1,4 +1,4 @@ > -# Copyright (C) 2013 Mathieu Desnoyers > <mathieu.desnoyers$(AM_V_at)efficios.com> > +# Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoy...@efficios.com> > # > # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED > # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. > -- > 2.17.1 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
