[gnome-terminal] Support silent build with automake 1.11
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-terminal] Support silent build with automake 1.11
- Date: Sun, 16 Aug 2009 18:34:31 +0000 (UTC)
commit 37fdb8db91e12d101f32626d6eeeb7c7e64ad255
Author: Christian Persch <chpe gnome org>
Date: Sun Aug 16 20:33:58 2009 +0200
Support silent build with automake 1.11
Add AM_SILENT_RULES, and sprinkle some $(AM_V_GEN) around.
configure.ac | 2 ++
src/Makefile.am | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c09c103..fbd5eed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,8 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
+
GETTEXT_PACKAGE=gnome-terminal
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4f466aa..2071f2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,25 +113,25 @@ terminal-type-builtins.h: stamp-terminal-type-builtins.h
@true
stamp-terminal-type-builtins.h: terminal-type-builtins.h.template $(TYPES_H_FILES)
- $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbh \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbh \
&& (cmp -s xgen-ttbh terminal-type-builtins.h || cp xgen-ttbh terminal-type-builtins.h ) \
&& rm -f xgen-ttbh \
&& echo timestamp > $(@F)
terminal-type-builtins.c: terminal-type-builtins.c.template $(TYPES_H_FILES)
- $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbc \
+ $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-ttbc \
&& (cmp -s xgen-ttbc terminal-type-builtins.c || cp xgen-ttbc terminal-type-builtins.c ) \
&& rm -f xgen-ttbc
terminal-marshal.h: $(srcdir)/terminal-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
+ $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
--header \
--internal > terminal-marshal.h.tmp \
&& mv terminal-marshal.h.tmp terminal-marshal.h ) \
|| ( rm -f terminal-marshal.h.tmp && exit 1 )
terminal-marshal.c: $(srcdir)/terminal-marshal.list
- ( $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
+ $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
--header \
--body \
--internal > terminal-marshal.c.tmp \
@@ -139,10 +139,10 @@ terminal-marshal.c: $(srcdir)/terminal-marshal.list
|| ( rm -f terminal-marshal.c.tmp && exit 1 )
terminal-factory-client.h: terminal-factory-service.xml
- $(DBUS_BINDING_TOOL) --mode=glib-client --output=$@ $<
+ $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-client --output=$@ $<
terminal-factory-server.h: terminal-factory-service.xml
- $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=terminal_factory --output=$@ $<
+ $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=terminal_factory --output=$@ $<
schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_in_files = gnome-terminal.schemas.in
@@ -196,6 +196,6 @@ install-data-local:
endif
%.ui: %.glade
- $(GTK_BUILDER_CONVERT) $< $@
+ $(AM_V_GEN) $(GTK_BUILDER_CONVERT) $< $@
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]