[glom] Support Automake silent rules
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom] Support Automake silent rules
- Date: Tue, 6 Oct 2009 21:12:17 +0000 (UTC)
commit 619af7a06195aa2b0a11813b3b249d51fced4b1c
Author: Daniel Elstner <daniel kitta gmail com>
Date: Tue Oct 6 22:43:30 2009 +0200
Support Automake silent rules
* configure.ac: Call the AM_SILENT_RULES macro if it is defined.
* Makefile.am (.rc.res): Prefix command with $(AM_V_GEN) to suppress
the echoing of the command line if silent rules are enabled.
* Makefile_libegg.am (eggmarshalers.h), (eggmarshalers.c): ditto.
ChangeLog | 9 +++++++++
Makefile.am | 2 +-
Makefile_libegg.am | 4 ++--
configure.ac | 1 +
4 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0584283..fc32ed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-06 Daniel Elstner <daniel kitta gmail com>
+
+ Support Automake silent rules
+
+ * configure.ac: Call the AM_SILENT_RULES macro if it is defined.
+ * Makefile.am (.rc.res): Prefix command with $(AM_V_GEN) to suppress
+ the echoing of the command line if silent rules are enabled.
+ * Makefile_libegg.am (eggmarshalers.h), (eggmarshalers.c): ditto.
+
1.12.2:
2009-10-05 Murray Cumming <murrayc murrayc com>
diff --git a/Makefile.am b/Makefile.am
index d0203db..9b2c832 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,7 +197,7 @@ uninstall-update-mime-database:
if HOST_WIN32
.rc.res:
- $(WINDRES) -i '$<' --input-format=rc -o '$@' -O coff
+ $(AM_V_GEN)$(WINDRES) -i '$<' --input-format=rc -o '$@' -O coff
endif
@INTLTOOL_DESKTOP_RULE@
diff --git a/Makefile_libegg.am b/Makefile_libegg.am
index 873d74c..be55e06 100644
--- a/Makefile_libegg.am
+++ b/Makefile_libegg.am
@@ -50,7 +50,7 @@ $(glom_utility_widgets_egg_toolpalette_libeggtoolpalette_a_OBJECTS): \
$(eggutildir)/eggmarshalers.c $(eggutildir)/eggmarshalers.h
$(eggutildir)/eggmarshalers.h: $(eggmarshalers_list)
- $(GLIB_GENMARSHAL) --prefix=_egg_marshal --header "$(eggmarshalers_list)" >'$@'
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal --header "$(eggmarshalers_list)" >'$@'
$(eggutildir)/eggmarshalers.c: $(eggmarshalers_list)
- $(GLIB_GENMARSHAL) --prefix=_egg_marshal --body "$(eggmarshalers_list)" >'$@'
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_egg_marshal --body "$(eggmarshalers_list)" >'$@'
diff --git a/configure.ac b/configure.ac
index e7cb81d..248397e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ AC_CONFIG_MACRO_DIR([macros])
AC_CONFIG_HEADERS([config.h glom/libglom/libglom_config.h])
AM_INIT_AUTOMAKE([1.10 check-news no-define nostdinc])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
AC_PROG_CC
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]