From ce74a1ae190597b84e816deca552d64633c21996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 26 Feb 2010 16:03:47 +0100 Subject: [PATCH] build: Make some more rules silent if requested --- Makefile.am | 4 ++-- gst/Makefile.am | 20 ++++++++++---------- gst/parse/Makefile.am | 4 ++-- libs/gst/base/Makefile.am | 4 ++-- libs/gst/check/Makefile.am | 10 +++++----- libs/gst/controller/Makefile.am | 4 ++-- libs/gst/dataprotocol/Makefile.am | 4 ++-- libs/gst/net/Makefile.am | 4 ++-- pkgconfig/Makefile.am | 8 ++++++-- tools/Makefile.am | 4 ++-- 10 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Makefile.am b/Makefile.am index d216e48e63..7e4f0035d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook all-local: gst-element-check-@GST_MAJORMINOR@.m4 gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4 - cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 + $(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 # note: keep in sync with configure.ac ACLOCAL_AMFLAGS = -I common/m4 -I . @@ -108,7 +108,7 @@ win32-update: $(top_srcdir)/win32/common/config.h check-enum-gettypes: $(top_builddir)/gst/gstenumtypes.h - echo 'Checking if all enum and flag _get_type() funcs are inited in gst_init()'; \ + @echo 'Checking if all enum and flag _get_type() funcs are inited in gst_init()'; \ FUNCS=`grep '_get_type (' gst/gstenumtypes.h | sed -e 's/^.*gst_/gst_/' -e 's/_get_type.*$$/_get_type/'`;\ MISSING_FUNCS=''; \ for f in $$FUNCS; do \ diff --git a/gst/Makefile.am b/gst/Makefile.am index 2e053feb27..b7e1bec92e 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -209,18 +209,18 @@ noinst_HEADERS = \ gst_private.h gstmarshal.h: gstmarshal.list - glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp + $(AM_V_GEN)glib-genmarshal --header --prefix=gst_marshal $(srcdir)/gstmarshal.list > gstmarshal.h.tmp && \ mv gstmarshal.h.tmp gstmarshal.h gstmarshal.c: gstmarshal.list gst_private.h - echo "#include \"gst_private.h\"" > gstmarshal.c.tmp - echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp - echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp - glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp + $(AM_V_GEN)echo "#include \"gst_private.h\"" > gstmarshal.c.tmp && \ + echo "#include \"glib-object.h\"" >> gstmarshal.c.tmp && \ + echo "#include \"gstmarshal.h\"" >> gstmarshal.c.tmp && \ + glib-genmarshal --body --prefix=gst_marshal $(srcdir)/gstmarshal.list >> gstmarshal.c.tmp && \ mv gstmarshal.c.tmp gstmarshal.c gstenumtypes.h: $(gst_headers) - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#ifndef __GST_ENUM_TYPES_H__\n#define __GST_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" \ @@ -228,7 +228,7 @@ gstenumtypes.h: $(gst_headers) $^ > gstenumtypes.h gstenumtypes.c: $(gst_headers) - glib-mkenums \ + $(AM_V_GEN)glib-mkenums \ --fhead "#include \"gst_private.h\"\n#include \n#define C_ENUM(v) ((gint) v)\n#define C_FLAGS(v) ((guint) v)\n " \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static gsize id = 0;\n static const G@Type@Value values[] = {" \ @@ -248,7 +248,7 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@include_HEA gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES)) Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la - $(INTROSPECTION_SCANNER) -v --namespace Gst \ + $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace Gst \ --nsversion=@GST_MAJORMINOR@ \ -I$(top_srcdir) \ -I$(top_builddir) \ @@ -279,14 +279,14 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif # try to prevent packaging errors check-libexecdir-consistency: - if test "${GST_PLUGIN_SCANNER_INSTALLED}" != "${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; then \ + @if test "${GST_PLUGIN_SCANNER_INSTALLED}" != "${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; then \ echo "*** Inconsistent libexecdir! Please use ./configure --libexecdir=/foo/bar"; \ echo "*** to set the libexecdir and not make libexecdir=/foo/bar or the like."; \ echo "*** The same goes for prefix, libdir etc."; \ diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am index 6f18cffc16..643b19cf4f 100644 --- a/gst/parse/Makefile.am +++ b/gst/parse/Makefile.am @@ -20,7 +20,7 @@ libgstparse_la_LIBADD = $(GST_ALL_LIBS) noinst_HEADERS = grammar.tab.h types.h grammar.tab.c grammar.tab.h: grammar.y - $(BISON_PATH) -d -v -p_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \ + $(AM_V_GEN)$(BISON_PATH) -d -v -p_gst_parse_yy $(srcdir)/grammar.y -o grammar.tab.c && \ mv grammar.tab.c grammar.tab_tmp.c && \ echo '#ifdef HAVE_CONFIG_H' > grammar.tab_tmp2.c && \ echo '#include ' >> grammar.tab_tmp2.c && \ @@ -30,7 +30,7 @@ grammar.tab.c grammar.tab.h: grammar.y mv grammar.tab_tmp2.c grammar.tab.c lex._gst_parse_yy.c: parse.l grammar.tab.h - $(FLEX_PATH) -P_gst_parse_yy $^ && \ + $(AM_V_GEN)$(FLEX_PATH) -P_gst_parse_yy $^ && \ mv lex._gst_parse_yy.c lex._gst_parse_yy_tmp.c && \ echo '#ifdef HAVE_CONFIG_H' > lex._gst_parse_yy_tmp2.c && \ echo '#include ' >> lex._gst_parse_yy_tmp2.c && \ diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 91733b40ca..ff839afceb 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -53,7 +53,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS)) GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ $(INTROSPECTION_SCANNER) -v --namespace GstBase \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ @@ -78,7 +78,7 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index 724d6a626e..a526afce70 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -35,7 +35,7 @@ libgstcheck_@GST_MAJORMINOR@include_HEADERS = \ CLEANFILES = *.gcno *.gcda *.gcov internal-check.h $(SYMBOLS_FILE) internal-check.h: $(top_builddir)/libs/gst/check/libcheck/check.h - cp $(top_builddir)/libs/gst/check/libcheck/check.h internal-check.h + $(AM_V_GEN)cp $(top_builddir)/libs/gst/check/libcheck/check.h internal-check.h %.c.gcov: .libs/libgstcheck_@GST_MAJORMINOR@_la-%.gcda %.c $(GCOV) -b -f -o $^ > $@.out @@ -93,12 +93,12 @@ LIBGSTCHECK_EXPORTED_SYMBOLS = \ # It is there for purpose. (Bug #602093) CHECK_SYMS=`$(SED) -n -e 's/^..*CK_EXPORT[ ]\{1,\}\([_0-9ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz]\{1,\}\)..*$$/\1/p' @top_srcdir@/libs/gst/check/libcheck/check.h.in` print-check-symbols: - for s in $(CHECK_SYMS); do \ + @for s in $(CHECK_SYMS); do \ echo $$s; \ done; $(SYMBOLS_FILE): - rm -f $(SYMBOLS_FILE) 2>/dev/null; \ + $(AM_V_GEN)rm -f $(SYMBOLS_FILE) 2>/dev/null; \ for s in $(LIBGSTCHECK_EXPORTED_SYMBOLS) $(CHECK_SYMS); do \ echo $$s >> $(SYMBOLS_FILE); \ done @@ -111,7 +111,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES) gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS)) GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ $(INTROSPECTION_SCANNER) -v --namespace GstCheck \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ @@ -136,7 +136,7 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am index 67cb9bf0e5..4bad0331a4 100644 --- a/libs/gst/controller/Makefile.am +++ b/libs/gst/controller/Makefile.am @@ -40,7 +40,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOU gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS)) GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ $(INTROSPECTION_SCANNER) -v --namespace GstController \ --nsversion=@GST_MAJORMINOR@ \ --strip-prefix=Gst \ @@ -65,7 +65,7 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/libs/gst/dataprotocol/Makefile.am b/libs/gst/dataprotocol/Makefile.am index 4079329747..29e002ba32 100644 --- a/libs/gst/dataprotocol/Makefile.am +++ b/libs/gst/dataprotocol/Makefile.am @@ -30,7 +30,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstdataprotocol_@GST_MAJORMINOR@_la_S gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS)) GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ $(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \ --strip-prefix=Gst \ --nsversion=@GST_MAJORMINOR@ \ @@ -55,7 +55,7 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am index 3bd9dd657f..a5210ff455 100644 --- a/libs/gst/net/Makefile.am +++ b/libs/gst/net/Makefile.am @@ -31,7 +31,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES)) gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS)) GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ + $(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \ $(INTROSPECTION_SCANNER) -v --namespace GstNet \ --strip-prefix=Gst \ --nsversion=@GST_MAJORMINOR@ \ @@ -56,7 +56,7 @@ typelibsdir = $(libdir)/girepository-1.0/ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) %.typelib: %.gir $(INTROSPECTION_COMPILER) - $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=$(top_builddir)/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) endif diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index af8983ad32..c928f25ecf 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -25,11 +25,15 @@ pcfiles_uninstalled = \ all-local: $(pcfiles) $(pcfiles_uninstalled) +cp_verbose = $(cp_verbose_$(V)) +cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) +cp_verbose_0 = @echo " CP $@"; + ### how to generate pc files %-@GST_MAJORMINOR@.pc: %.pc - cp $< $@ + $(cp_verbose_0)cp $< $@ %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc - cp $< $@ + $(cp_verbose_0)cp $< $@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pcfiles) diff --git a/tools/Makefile.am b/tools/Makefile.am index e383cb9711..51eb36b10f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -59,7 +59,7 @@ gst_xmlinspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) gst_xmlinspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS) gst-feedback-@GST_MAJORMINOR@: gst-feedback-m.m - cp $(srcdir)/gst-feedback-m.m $@ + $(AM_V_GEN)cp $(srcdir)/gst-feedback-m.m $@ && \ chmod +x $@ # make sure each unversioned tool comes from gst-run.c @@ -126,7 +126,7 @@ EXTRA_DIST = \ gst-plot-timeline.py %-@GST_MAJORMINOR@.1: %.1.in - sed \ + $(AM_V_GEN)sed \ -e s,gst-feedback,gst-feedback-@GST_MAJORMINOR@,g \ -e s,gst-inspect,gst-inspect-@GST_MAJORMINOR@,g \ -e s,gst-launch,gst-launch-@GST_MAJORMINOR@,g \