From dbfa88798ce69bc788a351b75db71d3101d87490 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 30 Nov 2018 18:06:45 -0500 Subject: [PATCH] Add silent mode to examples Makefiles Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- doc/examples/Makefile.am | 10 +++----- doc/examples/Makefile.examples.template | 7 +++-- doc/examples/dist-files/Makefile | 34 ++++++++++++------------- doc/examples/hlist/Makefile | 18 ++++++------- doc/examples/lfstack/Makefile | 12 ++++----- doc/examples/list/Makefile | 24 ++++++++--------- doc/examples/rculfhash/Makefile | 28 ++++++++++---------- doc/examples/rculfqueue/Makefile | 8 +++--- doc/examples/urcu-flavors/Makefile | 20 +++++++-------- doc/examples/wfcqueue/Makefile | 14 +++++----- doc/examples/wfstack/Makefile | 12 ++++----- 11 files changed, 93 insertions(+), 94 deletions(-) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 156dc85..3c3d152 100644 --- 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 4b2378e..238a5cc 100644 --- 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 cb380b7..08b7dcb 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. @@ -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 d705dac..57197a2 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. @@ -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 e8d1d13..42398ed 100644 --- 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 a0e7672..79a09e3 100644 --- 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 b0dd948..c64f40a 100644 --- 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 5538709..b964d23 100644 --- 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 f4cc0b1..fedadb2 100644 --- 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 98b9def..d1a5a2d 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. @@ -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 b8be3f5..098fb94 100644 --- 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 -- 2.34.1