Use AM_V_GEN in a few more places

Based on a patch by Javier Jardón in

https://bugzilla.gnome.org/show_bug.cgi?id=621720

diff --git a/Makefile.am b/Makefile.am
index 1063b9fb2fe713b5836e1b99b79e42fb4660b39b..729637e2e67329a5bfa438b3ce4736989f945c62 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,7 @@ distclean-local:
        fi
 
 ChangeLog:
-       @echo Creating $@
-       @if test -d "$(srcdir)/.git"; then \
+       $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
          (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
          && mv -f $@.tmp $@ \
          || ($(RM) $@.tmp; \

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c28a07f51a9509484eeb140fe8fc911f95332a81..80387ccdda4ff075af69d599e5ccdcd886892744 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -283,7 +283,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/       /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX
@@ -309,34 +309,34 @@ BUILT_SOURCES = \
 gdkenumtypes.h: stamp-gdkenumtypes.h
        @true
 stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
-       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
                $(gdk_public_h_sources) ) >> xgen-geth \
        && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
        && rm -f xgen-geth \
        && echo timestamp > $(@F)
 gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
-       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
                $(gdk_public_h_sources) ) > xgen-getc \
        && cp xgen-getc gdkenumtypes.c  \
        && rm -f xgen-getc
 
-# 
+#
 # Marshaller generation
 #
 gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp      \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp  \
        && mv gdkmarshalers-c.tmp gdkmarshalers.c \
        || ( rm -f gdkmarshalers-c.tmp && exit 1 )
 
 gdkconfig.h: stamp-gc-h
-       @if test -f gdkconfig.h; then :; \
+       $(AM_V_GEN) if test -f gdkconfig.h; then :; \
        else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: $(top_builddir)/config.status
-       cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
+       $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
        echo timestamp > stamp-gc-h
 
 dist-hook: ../build/win32/vs9/gdk.vcproj

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bc76c1577503e05bc9a1e4dd33f7a64dbbbab8ed..d04e253256c449a4e1207df6cad3f45f0712177a 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -99,7 +99,7 @@ endif
 # This places the generated .def file in srcdir, since it is expected to be there.
 # (The one from a tarball is)
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
+       $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | $(SED) -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def
 
 TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 if OS_LINUX
@@ -841,12 +841,12 @@ BUILT_SOURCES = $(gtk_built_sources)
 gtkmarshalers.h: stamp-gtkmarshalers.h
        @true
 stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header >> xgen-gmlh \
        && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
-       (echo "#include \"gtkmarshalers.h\""; \
+       $(AM_V_GEN) (echo "#include \"gtkmarshalers.h\""; \
         $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
@@ -854,19 +854,19 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
 gtktypebuiltins.h: stamp-gtktypebuiltins.h
        @true
 stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
-       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
                $(gtk_public_h_sources) ) >> xgen-gtbh \
        && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
        && rm -f xgen-gtbh \
        && echo timestamp > $(@F)
 gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
-       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
+       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
                $(gtk_public_h_sources) ) > xgen-gtbc \
        && cp xgen-gtbc gtktypebuiltins.c  \
        && rm -f xgen-gtbc
 
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
-       echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
+       $(AM_V_GEN) echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
          ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \