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 238a5cc8d45ec85c8512532a8b596b3fb81a5a99..e6196f53104f37796a03fd83320541a436710b32 100644 (file)
--- a/doc/examples/Makefile.examples.template
+++ b/doc/examples/Makefile.examples.template
@@ -17,12 +17,14 @@ AM_V_P := :
 all: $(BINARY)
 
 $(BINARY): $(OBJECTS)
 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)
                $(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)
 
                $(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 08b7dcb01232a417bc95b579c7612045ce1dbcd6..08f37283b65bf06b76bf17a912331d6eaa91c44b 100644 (file)
--- 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.
 #
 # 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 57197a21780260894431d6a0adccab928a91c413..4256035ea75adfe573eac26872d55c73b69cd945 100644 (file)
--- 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.
 #
 # 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 d1a5a2dd9c003529c6f609eb6a748c39bfb9986c..4f0338ecf34bba453ea9bf81aa619f978ba47874 100644 (file)
--- 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.
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 # OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.