From 1b8ee5196eb8ed684b0ee0d2f0d26e6bd82656af Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 15 Jun 2010 22:01:02 -0400 Subject: [PATCH] Sprinkle some $(AM_V_GEN) around to make the build more silent. --- Makefile.am | 5 ++--- gio/Makefile.am | 14 +++++++------- glib/Makefile.am | 8 ++++---- gmodule/Makefile.am | 4 ++-- gobject/Makefile.am | 16 ++++++++-------- gthread/Makefile.am | 2 +- tests/gobject/Makefile.am | 4 ++-- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index ace9c9a..5748ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,15 +82,14 @@ CONFIGURE_DEPENDENCIES = acglib.m4 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h glibconfig.h: stamp-gc-h - @if test -f glibconfig.h; then :; \ + $(AM_V_GEN) if test -f glibconfig.h; then :; \ else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi stamp-gc-h: config.status cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h echo timestamp > stamp-gc-h ChangeLog: - @echo Creating $@ - @if test -d "$(srcdir)/.git"; then \ + $(AM_V_GEN) test -d "$(srcdir)/.git"; then \ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ diff --git a/gio/Makefile.am b/gio/Makefile.am index a94bde0..9841d5c 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -24,15 +24,15 @@ uninstall-ms-lib: $(uninstall_ms_lib_cmd) gio.def: gio.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \ + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def.tmp && \ mv gio.def.tmp gio.def gioalias.h: gio.symbols - $(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h.tmp && \ + $(AM_V_GEN) $(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h.tmp && \ mv gioalias.h.tmp gioalias.h gioaliasdef.c: gio.symbols - $(PERL) $(srcdir)/makegioalias.pl -def < $(srcdir)/gio.symbols > gioaliasdef.c.tmp && \ + $(AM_V_GEN) $(PERL) $(srcdir)/makegioalias.pl -def < $(srcdir)/gio.symbols > gioaliasdef.c.tmp && \ mv gioaliasdef.c.tmp gioaliasdef.c if OS_LINUX @@ -71,11 +71,11 @@ else endif gio-marshal.h: gio-marshal.list - $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \ + $(AM_V_GEN) $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --header --internal > $@.tmp && \ mv $@.tmp $@ gio-marshal.c: gio-marshal.h gio-marshal.list - (echo "#include \"gio-marshal.h\""; \ + $(AM_V_GEN) (echo "#include \"gio-marshal.h\""; \ $(glib_genmarshal) --prefix=_gio_marshal $(srcdir)/gio-marshal.list --body --internal) > $@.tmp && \ mv $@.tmp $@ @@ -541,12 +541,12 @@ CLEANFILES = \ $(NULL) gioenumtypes.h: $(gio_headers) gioenumtypes.h.template - ( top_builddir=`cd $(top_builddir) && pwd`; \ + $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \ cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \ gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h gioenumtypes.c: $(gio_headers) gioenumtypes.c.template - ( top_builddir=`cd $(top_builddir) && pwd`; \ + $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \ cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \ gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c diff --git a/glib/Makefile.am b/glib/Makefile.am index 149004a..6fd3fd3 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -41,13 +41,13 @@ AM_CPPFLAGS = \ -DPCRE_STATIC glib.def: glib.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def galias.h: $(srcdir)/makegalias.pl glib.symbols - $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h + $(AM_V_GEN) $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h galiasdef.c: $(srcdir)/makegalias.pl glib.symbols - $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c + $(AM_V_GEN) $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c if OS_LINUX if HAVE_GNUC_VISIBILITY @@ -435,7 +435,7 @@ gdbdir = $(datadir)/glib-2.0/gdb dist_gdb_SCRIPTS = glib.py libglib-gdb.py: libglib-gdb.py.in - sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py + $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py install-data-hook: libglib-gdb.py diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 93a8473..b864d42 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -DG_DISABLE_DEPRECATED gmodule.def: gmodule.symbols - (echo -e EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > gmodule.def + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > gmodule.def EXTRA_DIST += \ makefile.msc.in \ @@ -91,7 +91,7 @@ libgmodule_2_0_la_LIBADD = $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) libgmodule_2_0_la_DEPENDENCIES = $(gmodule_win32_res) $(gmodule_def) gmodule-win32-res.o: gmodule.rc - $(WINDRES) gmodule.rc $@ + $(AM_V_GEN) $(WINDRES) gmodule.rc $@ gmodule-2.0.lib: libgmodule-2.0.la gmodule.def lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@ diff --git a/gobject/Makefile.am b/gobject/Makefile.am index c5be202..53da117 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -24,13 +24,13 @@ AM_CPPFLAGS = \ -DG_DISABLE_CONST_RETURNS gobject.def: gobject.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gobject.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def + $(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gobject.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def gobjectalias.h: gobject.symbols - $(PERL) $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h + $(AM_V_GEN) $(PERL) $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h gobjectaliasdef.c: gobject.symbols - $(PERL) $(srcdir)/makegobjectalias.pl -def < $(srcdir)/gobject.symbols > gobjectaliasdef.c + $(AM_V_GEN) $(PERL) $(srcdir)/makegobjectalias.pl -def < $(srcdir)/gobject.symbols > gobjectaliasdef.c if OS_LINUX if HAVE_GNUC_VISIBILITY @@ -209,7 +209,7 @@ gmarshal.h: stamp-gmarshal.h @true stamp-gmarshal.h: @REBUILD@ gmarshal.list glib-genmarshal$(EXEEXT) $(MAKE) glib-genmarshal$(EXEEXT) - echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \ + $(AM_V_GEN) echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \ && echo "#define __G_MARSHAL_H__" >> xgen-gmh \ && $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \ && echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \ @@ -218,12 +218,12 @@ stamp-gmarshal.h: @REBUILD@ gmarshal.list glib-genmarshal$(EXEEXT) && echo timestamp > $@ gmarshal.c: @REBUILD@ stamp-gmarshal.h - $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \ + $(AM_V_GEN) $(glib_genmarshal) --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \ && cp xgen-gmc gmarshal.c \ && rm -f xgen-gmc xgen-gmc~ gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list - grep '^[A-Z]' $(srcdir)/gmarshal.list \ + $(AM_V_GEN) grep '^[A-Z]' $(srcdir)/gmarshal.list \ | sed -e 's/^/"g_cclosure_marshal_/' -e 's/:/__/' -e 's/,/_/g' -e 's/$$/",/' > xgen-gms \ && cp xgen-gms gmarshal.strings \ && rm -f xgen-gms xgen-gms~ @@ -272,7 +272,7 @@ BUILT_EXTRA_DIST = \ gobjectaliasdef.c gobject-win32-res.o: gobject.rc - $(WINDRES) gobject.rc $@ + $(AM_V_GEN) $(WINDRES) gobject.rc $@ gobject-2.0.lib: libgobject-2.0.la gobject.def lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@ @@ -307,7 +307,7 @@ gdbdir = $(datadir)/glib-2.0/gdb dist_gdb_SCRIPTS = gobject.py libgobject-gdb.py: libgobject-gdb.py.in - sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libgobject-gdb.py.in > libgobject-gdb.py + $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libgobject-gdb.py.in > libgobject-gdb.py uninstall-gdb: -rm -r $(DESTDIR)$(datadir)/gdb diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 8252260..119e8e9 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -80,7 +80,7 @@ libgthread_2_0_la_LIBADD = $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD) $ libgthread_2_0_la_DEPENDENCIES = $(gthread_win32_res) $(gthread_def) gthread-win32-res.o: gthread.rc - $(WINDRES) gthread.rc $@ + $(AM_V_GEN) $(WINDRES) gthread.rc $@ gthread-2.0.lib: libgthread-2.0.la gthread.def lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gthread.def -out:$@ diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am index 9cfb33b..a550979 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -37,12 +37,12 @@ endif testmarshal.h: stamp-testmarshal.h @true stamp-testmarshal.h: @REBUILD@ testmarshal.list $(glib_genmarshal) - $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \ + $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \ && (cmp -s xgen-gmh testmarshal.h 2>/dev/null || cp xgen-gmh testmarshal.h) \ && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $@ testmarshal.c: @REBUILD@ testmarshal.list $(glib_genmarshal) - $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --body >> xgen-gmc \ + $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --body >> xgen-gmc \ && cp xgen-gmc testmarshal.c \ && rm -f xgen-gmc xgen-gmc~ -- 2.7.4