Add silent mode to examples Makefiles

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

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 156dc856e24cc2ac4db6ed70b1ac94ddad3c0063..3c3d15241bb9ba87ebf0dca133fbd24998c39fb1 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -121,7 +121,7 @@ SUBDIRS_PROXY = hlist list urcu-flavors wfcqueue rculfqueue \
 
 # Copies are for VPATH build support.
 all-local:
-       @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+       $(AM_V_at)if [ x"$(srcdir)" != x"$(builddir)" ]; then \
                cp -pfR $(srcdir)/dist-files $(builddir); \
                chmod -R u+w $(builddir)/dist-files; \
                cp -pf $(srcdir)/Makefile.examples.template $(builddir); \
@@ -132,23 +132,19 @@ all-local:
                done; \
        fi; \
        if [ x"$(shell echo "$(top_srcdir)" | $(GREP) "^/" | wc -l)" = x"1" ]; then \
-               echo "Examples: absolute top_srcdir path $(top_srcdir)"; \
                rel_src_subdir=""; \
        else \
-               echo "Examples: relative top_srcdir path $(top_srcdir)"; \
                rel_src_subdir="../"; \
        fi; \
        if [ x"$(shell echo "$(top_builddir)" | $(GREP) "^/" | wc -l)" = x"1" ]; then \
-               echo "Examples: absolute top_builddir path $(top_builddir)"; \
                rel_build_subdir=""; \
        else \
-               echo "Examples: relative top_builddir path $(top_builddir)"; \
                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_MAKEFLAGS) all;
+       $(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;
 
 clean-local:
-       @$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \
+       $(AM_V_at)$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \
        if [ x"$(srcdir)" != x"$(builddir)" ]; then \
                for subdir in $(SUBDIRS_PROXY); do \
                        rm -rf $(builddir)/$$subdir; \

diff --git a/doc/examples/Makefile.examples.template b/doc/examples/Makefile.examples.template
index 4b2378ea7b01e9d5d13baa0d156961255360d7f4..238a5cc8d45ec85c8512532a8b596b3fb81a5a99 100644 (file)
--- a/doc/examples/Makefile.examples.template
+++ b/doc/examples/Makefile.examples.template
@@ -12,15 +12,18 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 LOCAL_CFLAGS := -g -O2 -Wall
+AM_V_P := :
 
 all: $(BINARY)
 
 $(BINARY): $(OBJECTS)
-       $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+       @if $(AM_V_P); 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_CPPFLAGS) $(CPPFLAGS) \
+       @if $(AM_V_P); then set -x; else echo "  CC       $@"; fi; \
+               $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
                -c -o $@ $(SOURCES)
 
 .PHONY: clean

diff --git a/doc/examples/dist-files/Makefile b/doc/examples/dist-files/Makefile
index cb380b782ca57449edd88aa047a08e8961d81871..08b7dcb01232a417bc95b579c7612045ce1dbcd6 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@efficios.com>
+# Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers$(AM_V_at)efficios.com>
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 # OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -12,22 +12,22 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -C hlist
-       $(MAKE) -C list
-       $(MAKE) -C urcu-flavors
-       $(MAKE) -C wfcqueue
-       $(MAKE) -C rculfqueue
-       $(MAKE) -C wfstack
-       $(MAKE) -C lfstack
-       $(MAKE) -C rculfhash
+       $(AM_V_at)$(MAKE) -C hlist
+       $(AM_V_at)$(MAKE) -C list
+       $(AM_V_at)$(MAKE) -C urcu-flavors
+       $(AM_V_at)$(MAKE) -C wfcqueue
+       $(AM_V_at)$(MAKE) -C rculfqueue
+       $(AM_V_at)$(MAKE) -C wfstack
+       $(AM_V_at)$(MAKE) -C lfstack
+       $(AM_V_at)$(MAKE) -C rculfhash
 
 .PHONY: clean
 clean:
-       $(MAKE) -C hlist clean
-       $(MAKE) -C list clean
-       $(MAKE) -C urcu-flavors clean
-       $(MAKE) -C wfcqueue clean
-       $(MAKE) -C rculfqueue clean
-       $(MAKE) -C wfstack clean
-       $(MAKE) -C lfstack clean
-       $(MAKE) -C rculfhash clean
+       $(AM_V_at)$(MAKE) -C hlist clean
+       $(AM_V_at)$(MAKE) -C list clean
+       $(AM_V_at)$(MAKE) -C urcu-flavors clean
+       $(AM_V_at)$(MAKE) -C wfcqueue clean
+       $(AM_V_at)$(MAKE) -C rculfqueue clean
+       $(AM_V_at)$(MAKE) -C wfstack clean
+       $(AM_V_at)$(MAKE) -C lfstack clean
+       $(AM_V_at)$(MAKE) -C rculfhash clean

diff --git a/doc/examples/hlist/Makefile b/doc/examples/hlist/Makefile
index d705daca70d7a3b5a31d3227ddd9ddf8a1cee04f..57197a21780260894431d6a0adccab928a91c413 100644 (file)
--- a/doc/examples/hlist/Makefile
+++ b/doc/examples/hlist/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers$(AM_V_at)efficios.com>
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 # OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -12,14 +12,14 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_hlist_add_head_rcu
-       $(MAKE) -f Makefile.cds_hlist_del_rcu
-       $(MAKE) -f Makefile.cds_hlist_for_each_rcu
-       $(MAKE) -f Makefile.cds_hlist_for_each_entry_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_add_head_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_del_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_for_each_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_for_each_entry_rcu
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_hlist_add_head_rcu clean
-       $(MAKE) -f Makefile.cds_hlist_del_rcu clean
-       $(MAKE) -f Makefile.cds_hlist_for_each_rcu clean
-       $(MAKE) -f Makefile.cds_hlist_for_each_entry_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_add_head_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_del_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_for_each_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_hlist_for_each_entry_rcu clean

diff --git a/doc/examples/lfstack/Makefile b/doc/examples/lfstack/Makefile
index e8d1d138c4997ba127fef271c7769da1b8b3ca24..42398ed2b23ee3c20e8f8eba79efc99ca4517609 100644 (file)
--- a/doc/examples/lfstack/Makefile
+++ b/doc/examples/lfstack/Makefile
@@ -12,12 +12,12 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_lfs_push
-       $(MAKE) -f Makefile.cds_lfs_pop_blocking
-       $(MAKE) -f Makefile.cds_lfs_pop_all_blocking
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_push
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_pop_blocking
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_pop_all_blocking
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_lfs_push clean
-       $(MAKE) -f Makefile.cds_lfs_pop_blocking clean
-       $(MAKE) -f Makefile.cds_lfs_pop_all_blocking clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_push clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_pop_blocking clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfs_pop_all_blocking clean

diff --git a/doc/examples/list/Makefile b/doc/examples/list/Makefile
index a0e76728663ff78785d453c2f41f78478bfc09d8..79a09e313ad6bff1934b936e7e1d30977e021f21 100644 (file)
--- a/doc/examples/list/Makefile
+++ b/doc/examples/list/Makefile
@@ -12,18 +12,18 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_list_add_rcu
-       $(MAKE) -f Makefile.cds_list_add_tail_rcu
-       $(MAKE) -f Makefile.cds_list_del_rcu
-       $(MAKE) -f Makefile.cds_list_for_each_rcu
-       $(MAKE) -f Makefile.cds_list_for_each_entry_rcu
-       $(MAKE) -f Makefile.cds_list_replace_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_add_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_add_tail_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_del_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_for_each_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_for_each_entry_rcu
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_replace_rcu
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_list_add_rcu clean
-       $(MAKE) -f Makefile.cds_list_add_tail_rcu clean
-       $(MAKE) -f Makefile.cds_list_del_rcu clean
-       $(MAKE) -f Makefile.cds_list_for_each_rcu clean
-       $(MAKE) -f Makefile.cds_list_for_each_entry_rcu clean
-       $(MAKE) -f Makefile.cds_list_replace_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_add_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_add_tail_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_del_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_for_each_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_for_each_entry_rcu clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_list_replace_rcu clean

diff --git a/doc/examples/rculfhash/Makefile b/doc/examples/rculfhash/Makefile
index b0dd94804ecaa847c45e5e47ef40f3171fdda78d..c64f40a85cbc4080b8b9fdbb8ec18b2e363c1c83 100644 (file)
--- a/doc/examples/rculfhash/Makefile
+++ b/doc/examples/rculfhash/Makefile
@@ -12,20 +12,20 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_lfht_add
-       $(MAKE) -f Makefile.cds_lfht_add_unique
-       $(MAKE) -f Makefile.cds_lfht_add_replace
-       $(MAKE) -f Makefile.cds_lfht_del
-       $(MAKE) -f Makefile.cds_lfht_destroy
-       $(MAKE) -f Makefile.cds_lfht_lookup
-       $(MAKE) -f Makefile.cds_lfht_for_each_entry_duplicate
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add_unique
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add_replace
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_del
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_destroy
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_lookup
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_for_each_entry_duplicate
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_lfht_add clean
-       $(MAKE) -f Makefile.cds_lfht_add_unique clean
-       $(MAKE) -f Makefile.cds_lfht_add_replace clean
-       $(MAKE) -f Makefile.cds_lfht_del clean
-       $(MAKE) -f Makefile.cds_lfht_destroy clean
-       $(MAKE) -f Makefile.cds_lfht_lookup clean
-       $(MAKE) -f Makefile.cds_lfht_for_each_entry_duplicate clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add_unique clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_add_replace clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_del clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_destroy clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_lookup clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfht_for_each_entry_duplicate clean

diff --git a/doc/examples/rculfqueue/Makefile b/doc/examples/rculfqueue/Makefile
index 5538709863af917128343d5a1da0ff0100cfd4de..b964d2322d52e8541e00b86d0cbf620593f316c0 100644 (file)
--- a/doc/examples/rculfqueue/Makefile
+++ b/doc/examples/rculfqueue/Makefile
@@ -12,10 +12,10 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_lfq_enqueue
-       $(MAKE) -f Makefile.cds_lfq_dequeue
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfq_enqueue
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfq_dequeue
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_lfq_enqueue clean
-       $(MAKE) -f Makefile.cds_lfq_dequeue clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfq_enqueue clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_lfq_dequeue clean

diff --git a/doc/examples/urcu-flavors/Makefile b/doc/examples/urcu-flavors/Makefile
index f4cc0b1b1f3733e8a2b813a36e2034d36a4b0588..fedadb2ad638035e61c489efa75c00687b8ba92f 100644 (file)
--- a/doc/examples/urcu-flavors/Makefile
+++ b/doc/examples/urcu-flavors/Makefile
@@ -12,16 +12,16 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.qsbr
-       $(MAKE) -f Makefile.mb
-       $(MAKE) -f Makefile.membarrier
-       $(MAKE) -f Makefile.signal
-       $(MAKE) -f Makefile.bp
+       $(AM_V_at)$(MAKE) -f Makefile.qsbr
+       $(AM_V_at)$(MAKE) -f Makefile.mb
+       $(AM_V_at)$(MAKE) -f Makefile.membarrier
+       $(AM_V_at)$(MAKE) -f Makefile.signal
+       $(AM_V_at)$(MAKE) -f Makefile.bp
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.qsbr clean
-       $(MAKE) -f Makefile.mb clean
-       $(MAKE) -f Makefile.membarrier clean
-       $(MAKE) -f Makefile.signal clean
-       $(MAKE) -f Makefile.bp clean
+       $(AM_V_at)$(MAKE) -f Makefile.qsbr clean
+       $(AM_V_at)$(MAKE) -f Makefile.mb clean
+       $(AM_V_at)$(MAKE) -f Makefile.membarrier clean
+       $(AM_V_at)$(MAKE) -f Makefile.signal clean
+       $(AM_V_at)$(MAKE) -f Makefile.bp clean

diff --git a/doc/examples/wfcqueue/Makefile b/doc/examples/wfcqueue/Makefile
index 98b9def39def20722686d5789f359d20ae0954a0..d1a5a2dd9c003529c6f609eb6a748c39bfb9986c 100644 (file)
--- a/doc/examples/wfcqueue/Makefile
+++ b/doc/examples/wfcqueue/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013  Mathieu Desnoyers <mathieu.desnoyers$(AM_V_at)efficios.com>
 #
 # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 # OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -12,12 +12,12 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_wfcq_enqueue
-       $(MAKE) -f Makefile.cds_wfcq_dequeue
-       $(MAKE) -f Makefile.cds_wfcq_splice
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_enqueue
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_dequeue
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_splice
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_wfcq_enqueue clean
-       $(MAKE) -f Makefile.cds_wfcq_dequeue clean
-       $(MAKE) -f Makefile.cds_wfcq_splice clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_enqueue clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_dequeue clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfcq_splice clean

diff --git a/doc/examples/wfstack/Makefile b/doc/examples/wfstack/Makefile
index b8be3f5bfb733063ec3a92e4981492c3dce2454f..098fb94f206aeb27ec683187975cb60ada6f913a 100644 (file)
--- a/doc/examples/wfstack/Makefile
+++ b/doc/examples/wfstack/Makefile
@@ -12,12 +12,12 @@
 # This makefile is purposefully kept simple to support GNU and BSD make.
 
 all:
-       $(MAKE) -f Makefile.cds_wfs_push
-       $(MAKE) -f Makefile.cds_wfs_pop
-       $(MAKE) -f Makefile.cds_wfs_pop_all_blocking
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_push
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_pop
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_pop_all_blocking
 
 .PHONY: clean
 clean:
-       $(MAKE) -f Makefile.cds_wfs_push clean
-       $(MAKE) -f Makefile.cds_wfs_pop clean
-       $(MAKE) -f Makefile.cds_wfs_pop_all_blocking clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_push clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_pop clean
+       $(AM_V_at)$(MAKE) -f Makefile.cds_wfs_pop_all_blocking clean