[mutter] Added --enable-silent-rules if automake-1.11 is available
- From: Tomas Frydrych <tomasf src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mutter] Added --enable-silent-rules if automake-1.11 is available
- Date: Fri, 7 Aug 2009 16:56:58 +0000 (UTC)
commit 0f64202a29dc7a4fb388e0b64ab429ffe80a4bfb
Author: Tomas Frydrych <tf linux intel com>
Date: Thu Aug 6 22:41:52 2009 +0100
Added --enable-silent-rules if automake-1.11 is available
configure.in | 1 +
src/Makefile.am | 18 +++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index f758628..384bc6c 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,7 @@ AC_CONFIG_SRCDIR(src/core/display.c)
AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])],)
AM_MAINTAINER_MODE
MUTTER_MAJOR_VERSION=mutter_major_version
diff --git a/src/Makefile.am b/src/Makefile.am
index 2ee9978..6bd7507 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -199,10 +199,14 @@ gir_DATA = Meta-$(api_version).gir
typelibdir = $(pkglibdir)
typelib_DATA = Meta-$(api_version).typelib
+GIR_VERBOSE = $(GIR_VERBOSE_$(V))
+GIR_VERBOSE_ = $(GIR_VERBOSE_$(AM_DEFAULT_VERBOSITY))
+GIR_VERBOSE_0 = @echo GIR $@;
+
# We need to strip out the attribute that would point back to libmutter-introspect
# so that libgirepository looks for symbols in the executable instead
Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES)
- pwd=`pwd` ; \
+ $(GIR_VERBOSE) pwd=`pwd` ; \
cd $(srcdir) && \
$(G_IR_SCANNER) \
--namespace=Meta \
@@ -221,7 +225,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu
-o $$pwd/$@
Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
- LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) Meta-$(api_version).gir -o $@
+ $(GIR_VERBOSE) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) Meta-$(api_version).gir -o $@
endif
EFENCE=
@@ -308,7 +312,7 @@ CLEANFILES += $(MUTTER_STAMP_FILES)
mutter-marshal.h: stamp-mutter-marshal.h
@true
stamp-mutter-marshal.h: Makefile mutter-marshal.list
- $(GLIB_GENMARSHAL) \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) \
--prefix=_mutter_marshal \
--header \
$(srcdir)/mutter-marshal.list > xgen-tmh && \
@@ -317,7 +321,7 @@ stamp-mutter-marshal.h: Makefile mutter-marshal.list
echo timestamp > $(@F)
mutter-marshal.c: Makefile mutter-marshal.list
- (echo "#include \"mutter-marshal.h\"" ; \
+ $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
$(GLIB_GENMARSHAL) \
--prefix=_mutter_marshal \
--body \
@@ -328,16 +332,16 @@ mutter-marshal.c: Makefile mutter-marshal.list
mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
@true
stamp-mutter-enum-types.h: $(mutter_source_h) mutter-enum-types.h.in
- ( cd $(srcdir) && \
+ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/mutter-enum-types.h.in \
$(libmutterinclude_base_headers) ) >> xgen-teth && \
- (cmp xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
+ (cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
rm -f xgen-teth && \
echo timestamp > $(@F)
mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
- ( cd $(srcdir) && \
+ $(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/mutter-enum-types.c.in \
$(libmutterinclude_base_headers) ) >> xgen-tetc && \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]