build: Enable silent rules by default

diff --git a/Makefile.am b/Makefile.am
index c2613ea405fb399662573c1dcdd8fe3b204d68bf..b59d5d179643e54684fda856308fdd4b5d8ffc51 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ pkgconfig_DATA = vala-1.0.pc
 .PHONY: bootstrap
 bootstrap: all
        find $(top_srcdir) -name "*.vala.stamp" | xargs rm -f
-       $(MAKE) $(AM_MAKEFLAGS) all VALAC=$(abs_top_builddir)/compiler/valac
+       $(MAKE) $(AM_MAKEFLAGS) all VALAC=$(abs_top_builddir)/compiler/valac V=$V
 
 .PHONY: test
 test:

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index f3b5d2e7cfdb72d6b6a6c3282b380c326f1605d3..f693b3ed36a687b2acee4c7cf4487c84dcdf8467 100644 (file)
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -77,7 +77,7 @@ ccodeinclude_HEADERS = \
        $(NULL)
 
 ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES)
-       $(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --pkg config -H valaccode.h --library ccode $^
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --pkg config -H valaccode.h --library ccode $^
        touch $@
 
 libvalaccode_la_LIBADD = \
@@ -93,3 +93,6 @@ MAINTAINERCLEANFILES = \
        $(libvalaccode_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index 902cf5d25f3e8ed620cc56e970447871ecd55bb1..b672c27840483046ee34de54fe6c1ac170650bdf 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -57,8 +57,8 @@ codegeninclude_HEADERS = \
        $(NULL)
 
 codegen.vapi codegen.vala.stamp: $(libvala_la_VALASOURCES)
-       $(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala -H valacodegen.h --library codegen $^
-       touch $@
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala -H valacodegen.h --library codegen $^
+       @touch $@
 
 libvala_la_LDFLAGS = -no-undefined
 
@@ -76,3 +76,7 @@ MAINTAINERCLEANFILES = \
        $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;
+

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index a8efb00732343d3d958fb3f468ed9e8bc8833dee..506e3c2ae282961b379770e133339299d9a39f2c 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -26,8 +26,8 @@ valac_SOURCES = \
        $(NULL)
 
 valac.vala.stamp: $(valac_VALASOURCES)
-       $(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../codegen --pkg codegen --pkg config $^
-       touch $@
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../codegen --pkg codegen --pkg config $^
+       @touch $@
 
 valac_LDADD = \
        $(COVERAGE_LIBS) \
@@ -41,3 +41,6 @@ MAINTAINERCLEANFILES = \
        $(valac_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;

diff --git a/configure.ac b/configure.ac
index b24997c8a0c277d33a04a99dcac9fa903ae71e6a..b97ed1eaea625e7be0c6f43b0525ee7fd953a745 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,8 @@ AC_SUBST(GTHREAD_LIBS)
 AC_PATH_PROG([XSLTPROC], [xsltproc], :)
 AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 AC_CONFIG_FILES([Makefile
            vala-1.0.pc
            gee/Makefile

diff --git a/doc/vala/Makefile.am b/doc/vala/Makefile.am
index 0bdc8f334ddf7fdd1d240d90eb87ee72eb255e59..c0a9a0b91e1c82d7b8873ba07638196f446a9252 100644 (file)
--- a/doc/vala/Makefile.am
+++ b/doc/vala/Makefile.am
@@ -32,12 +32,12 @@ book_DATA = \
 endif
 
 index.html: $(book_sources) xhtml.xsl
-       $(XSLTPROC) --xinclude $(srcdir)/xhtml.xsl $(srcdir)/index.xml > index.html
+       $(AM_V_GEN)$(XSLTPROC) --xinclude $(srcdir)/xhtml.xsl $(srcdir)/index.xml > index.html
 
 $(chapter_data): index.html
 
 vala.devhelp2: $(book_sources) devhelp.xsl
-       $(XSLTPROC) --xinclude $(srcdir)/devhelp.xsl $(srcdir)/index.xml > vala.devhelp2
+       $(AM_V_GEN)$(XSLTPROC) --xinclude $(srcdir)/devhelp.xsl $(srcdir)/index.xml > vala.devhelp2
 
 book_sources = \
        index.xml \

diff --git a/gee/Makefile.am b/gee/Makefile.am
index 5b358c56d3dd9340342dbf253f8e663ba2efefdc..82e7e366ca101e940c644142873d94d53b98b541 100644 (file)
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -36,8 +36,8 @@ geeinclude_HEADERS = \
        $(NULL)
 
 gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
-       $(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H valagee.h --library gee $^
-       touch $@
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H valagee.h --library gee $^
+       @touch $@
 
 libgee_la_LIBADD = \
        $(COVERAGE_LIBS) \
@@ -52,3 +52,6 @@ MAINTAINERCLEANFILES = \
        $(libgee_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 72c2b88b3022a2124155cafdf2edacb1c1901225..69f0d0ac6f158b667012c71bfc5fef59d883b542 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -172,8 +172,8 @@ valainclude_HEADERS = \
        $(NULL)
 
 vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
-       $(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config -H vala.h --library vala $^
-       touch $@
+       $(VALA_V)$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config -H vala.h --library vala $^
+       @touch $@
 
 libvalacore_la_LIBADD = \
        $(COVERAGE_LIBS) \
@@ -190,3 +190,6 @@ MAINTAINERCLEANFILES = \
        $(libvalacore_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index c71f5082b96213055dc13f34cf2b127a6e875dd8..529cb0b3e142d406488c2c16253d1ef4256ddc71 100644 (file)
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -41,12 +41,12 @@ vapicheck_SOURCES = \
        $(NULL)
 
 vapigen.vala.stamp: $(vapigen_VALASOURCES)
-       $(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
-       touch $@
+       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
+       @touch $@
 
 vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
-       $(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
-       touch $@
+       $(VALA_V)$(VALAC) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
+       @touch $@
 
 vapigen_LDADD = \
        $(GLIB_LIBS) \
@@ -67,3 +67,6 @@ MAINTAINERCLEANFILES = \
        $(vapicheck_VALASOURCES:.vala=.c) \
        $(NULL)
 
+VALA_V = $(VALA_V_$(V))
+VALA_V_ = $(VALA_V_$(AM_DEFAULT_VERBOSITY))
+VALA_V_0 = @echo "  VALAC " $^;