From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 12 Dec 2018 20:30:59 +0000 (-0500)
Subject: Fix: examples silent rules on Solaris
X-Git-Tag: v0.11.0~15
X-Git-Url: https://git.lttng.org/?p=urcu.git;a=commitdiff_plain;h=48e2efad52474ba5fff6d7f452866fc8cdadab44

Fix: examples silent rules on Solaris

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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.desnoyers@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.desnoyers@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.desnoyers@efficios.com>
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 # OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.