From 48e2efad52474ba5fff6d7f452866fc8cdadab44 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 12 Dec 2018 15:30:59 -0500 Subject: [PATCH] Fix: examples silent rules on Solaris Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- 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 +# Copyright (C) 2013 Mathieu Desnoyers # # 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 +# Copyright (C) 2013 Mathieu Desnoyers # # 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 +# Copyright (C) 2013 Mathieu Desnoyers # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. -- 2.34.1