From 83fc188f73fa23345fc593d66cee965f1991e1ea Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 16 Sep 2009 17:43:58 +0100 Subject: [PATCH] [build] Split out the custom silent rules The silent rules we use for custom targets should be moved into a separate Makefile.am that gets included from all the others. --- Makefile.am | 8 ++------ common/Makefile.am | 8 ++------ gl/Makefile.am | 2 ++ gles/Makefile.am | 2 ++ 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7e28f92c0..58f762fa1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,6 @@ -NULL = +include $(top_srcdir)/build/autotools/Makefile.am.silent -if USE_SHAVE -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -else -QUIET_GEN = $(AM_V_GEN) -endif # USE_SHAVE +NULL = SUBDIRS = common $(CLUTTER_COGL) diff --git a/common/Makefile.am b/common/Makefile.am index 6a9116900..a9b9a13a6 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,10 +1,6 @@ -NULL = +include $(top_srcdir)/build/autotools/Makefile.am.silent -if USE_SHAVE -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -else -QUIET_GEN = $(AM_V_GEN) -endif # USE_SHAVE +NULL = INCLUDES = \ -I$(top_srcdir) \ diff --git a/gl/Makefile.am b/gl/Makefile.am index 7864a4aee..993ccaae9 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/build/autotools/Makefile.am.silent + NULL = cogl_headers = \ diff --git a/gles/Makefile.am b/gles/Makefile.am index 8c3dde88a..3d1ee4006 100644 --- a/gles/Makefile.am +++ b/gles/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/build/autotools/Makefile.am.silent + libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl libclutterinclude_HEADERS = \ $(top_builddir)/clutter/cogl/cogl.h \