From 7aa65b55fc5b1edf174bf1b1210bf5b899084f36 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 26 Feb 2010 16:22:00 +0100 Subject: [PATCH] build: Make some generic rules silent --- check.mak | 24 ++++++++++++------------ cruft.mak | 2 +- glib-gen.mak | 14 +++++++------- gst-glib-gen.mak | 14 +++++++------- win32.mak | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/check.mak b/check.mak index 01702c3..4a13504 100644 --- a/check.mak +++ b/check.mak @@ -40,10 +40,10 @@ LOOPS = 10 # valgrind any given test by running make test.valgrind %.valgrind: % - $(TESTS_ENVIRONMENT) \ + @$(TESTS_ENVIRONMENT) \ CK_DEFAULT_TIMEOUT=360 \ G_SLICE=always-malloc \ - $(LIBTOOL) --mode=execute \ + $(LIBTOOL) --mode=execute \ $(VALGRIND_PATH) -q \ $(foreach s,$(SUPPRESSIONS),--suppressions=$(s)) \ --tool=memcheck --leak-check=full --trace-children=yes \ @@ -57,10 +57,10 @@ LOOPS = 10 # valgrind any given test and generate suppressions for it %.valgrind.gen-suppressions: % - $(TESTS_ENVIRONMENT) \ + @$(TESTS_ENVIRONMENT) \ CK_DEFAULT_TIMEOUT=360 \ G_SLICE=always-malloc \ - $(LIBTOOL) --mode=execute \ + $(LIBTOOL) --mode=execute \ $(VALGRIND_PATH) -q \ $(foreach s,$(SUPPRESSIONS),--suppressions=$(s)) \ --tool=memcheck --leak-check=full --trace-children=yes \ @@ -75,17 +75,17 @@ LOOPS = 10 # gdb any given test by running make test.gdb %.gdb: % - $(TESTS_ENVIRONMENT) \ + @$(TESTS_ENVIRONMENT) \ CK_FORK=no \ - $(LIBTOOL) --mode=execute \ + $(LIBTOOL) --mode=execute \ gdb $* # torture tests torture: $(TESTS) -rm test-registry.xml @echo "Torturing tests ..." - for i in `seq 1 $(LOOPS)`; do \ - $(MAKE) check || \ + @for i in `seq 1 $(LOOPS)`; do \ + $(MAKE) check || \ (echo "Failure after $$i runs"; exit 1) || \ exit 1; \ done @@ -97,8 +97,8 @@ torture: $(TESTS) forever: $(TESTS) -rm test-registry.xml @echo "Forever tests ..." - while true; do \ - $(MAKE) check || \ + @while true; do \ + $(MAKE) check || \ (echo "Failure"; exit 1) || \ exit 1; \ done @@ -107,7 +107,7 @@ forever: $(TESTS) valgrind: $(TESTS) @echo "Valgrinding tests ..." @failed=0; \ - for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \ + @for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \ $(MAKE) $$t.valgrind; \ if test "$$?" -ne 0; then \ echo "Valgrind error for test $$t"; \ @@ -125,7 +125,7 @@ valgrind: $(TESTS) GST_INSPECT = $(GST_TOOLS_DIR)/gst-inspect-$(GST_MAJORMINOR) inspect: @echo "Inspecting features ..." - for e in `$(TESTS_ENVIRONMENT) $(GST_INSPECT) | head -n -2 \ + @for e in `$(TESTS_ENVIRONMENT) $(GST_INSPECT) | head -n -2 \ | cut -d: -f2`; \ do echo Inspecting $$e; \ $(GST_INSPECT) $$e > /dev/null 2>&1; done diff --git a/cruft.mak b/cruft.mak index ca59440..60176c5 100644 --- a/cruft.mak +++ b/cruft.mak @@ -5,7 +5,7 @@ # set CRUFT_FILES and/or CRUFT_DIRS in your Makefile.am when you include this check-cruft: - cruft_files=""; cruft_dirs=""; \ + @cruft_files=""; cruft_dirs=""; \ for f in $(CRUFT_FILES); do \ if test -e $$f; then \ cruft_files="$$cruft_files $$f"; \ diff --git a/glib-gen.mak b/glib-gen.mak index e5fcde1..809f502 100644 --- a/glib-gen.mak +++ b/glib-gen.mak @@ -9,16 +9,16 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") # these are all the rules generating the relevant files %-marshal.h: %-marshal.list - glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $^ > $*-marshal.h.tmp + $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_enum_prefix)_marshal $^ > $*-marshal.h.tmp && \ mv $*-marshal.h.tmp $*-marshal.h %-marshal.c: %-marshal.list - echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp - glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $^ >> $*-marshal.c.tmp + $(AM_V_GEN)echo "#include \"$*-marshal.h\"" >> $*-marshal.c.tmp && \ + glib-genmarshal --body --prefix=$(glib_enum_prefix)_marshal $^ >> $*-marshal.c.tmp && \ mv $*-marshal.c.tmp $*-marshal.c %-enumtypes.h: $(glib_enum_headers) - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ --fprod "\n/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -27,7 +27,7 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") %-enumtypes.c: $(glib_enum_headers) @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \ @@ -38,7 +38,7 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") # a hack rule to make sure .Plo files exist because they get include'd # from Makefile's .deps/%-marshal.Plo: - touch $@ + @touch $@ .deps/%-enumtypes.Plo: - touch $@ + @touch $@ diff --git a/gst-glib-gen.mak b/gst-glib-gen.mak index 06724ec..c746b8c 100644 --- a/gst-glib-gen.mak +++ b/gst-glib-gen.mak @@ -10,16 +10,16 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") # these are all the rules generating the relevant files $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list - glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp + $(AM_V_GEN)glib-genmarshal --header --prefix=$(glib_gen_prefix)_marshal $^ > $(glib_gen_basename)-marshal.h.tmp && \ mv $(glib_gen_basename)-marshal.h.tmp $(glib_gen_basename)-marshal.h $(glib_gen_basename)-marshal.c: $(glib_gen_basename)-marshal.list - echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp - glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp + $(AM_V_GEN)echo "#include \"$(glib_gen_basename)-marshal.h\"" >> $(glib_gen_basename)-marshal.c.tmp && \ + glib-genmarshal --body --prefix=$(glib_gen_prefix)_marshal $^ >> $(glib_gen_basename)-marshal.c.tmp && \ mv $(glib_gen_basename)-marshal.c.tmp $(glib_gen_basename)-marshal.c $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ --fprod "\n/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -28,7 +28,7 @@ $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers) $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) @if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \ @@ -39,7 +39,7 @@ $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers) # a hack rule to make sure .Plo files exist because they get include'd # from Makefile's .deps/%-marshal.Plo: - touch $@ + @touch $@ .deps/%-enumtypes.Plo: - touch $@ + @touch $@ diff --git a/win32.mak b/win32.mak index 87ac482..a962e89 100644 --- a/win32.mak +++ b/win32.mak @@ -36,7 +36,7 @@ win32-check-crlf: # (don't care about other unixes for now, it's enough if it works on one of # the linux build bots; we assume .so ) check-exports: - fail=0 ; \ + @fail=0 ; \ for l in $(win32defs); do \ libbase=`basename "$$l" ".def"`; \ libso=`find "$(top_builddir)" -name "$$libbase-@GST_MAJORMINOR@.so" | grep -v /_build/ | head -n1`; \ @@ -58,7 +58,7 @@ check-exports: # complain about nonportable 64-bit printf format strings (%lld, %llu etc.) check-nonportable-int64-print-format: - fail=0 ; \ + @fail=0 ; \ loc=`find "$(top_srcdir)" -name '*.c' | xargs grep -n -e '%[0-9]*ll[udx]'`; \ if test "x$$loc" != "x"; then \ echo "Please fix the following print format strings:" ; \ -- 2.7.4