summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Elstner <daniel.kitta@gmail.com>2009-09-19 03:34:28 +0200
committerDaniel Elstner <daniel.kitta@gmail.com>2009-09-19 03:34:28 +0200
commitfa03634b5963af18340258a67063f3a527c4e471 (patch)
treea182d576d0016bdef5d51d41aa007e81b7d8d5ae
parentc5383f584cc2e52cdda95a65e40f3ab62ccdc8d0 (diff)
downloadglibmm-fa03634b5963af18340258a67063f3a527c4e471.tar.gz
Support Automake silent rules
* configure.ac: Call the AM_SILENT_RULES macro if it is defined. (AM_INIT_AUTOMAKE): Add check-news option. * glib/src/Makefile.am: Prefix the M4 command line with $(AM_V_GEN) in order to support the silent rules feature of Automake.
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac6
-rw-r--r--glib/src/Makefile.am2
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index be2f187f..fbb9f4ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-19 Daniel Elstner <daniel.kitta@gmail.com>
+
+ Support Automake silent rules
+
+ * configure.ac: Call the AM_SILENT_RULES macro if it is defined.
+ (AM_INIT_AUTOMAKE): Add check-news option.
+ * glib/src/Makefile.am: Prefix the M4 command line with $(AM_V_GEN)
+ in order to support the silent rules feature of Automake.
+
2009-09-17 Daniel Elstner <danielk@openismus.com>
Do not complain about missing docs_override.xml
diff --git a/configure.ac b/configure.ac
index f9975435..fb10aa2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,8 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([glibmm], [2.21.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
+AC_INIT([glibmm], [2.21.5],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
[glibmm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])
@@ -24,7 +25,8 @@ AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([config.h glib/glibmmconfig.h gio/giommconfig.h])
-AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-pax])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
diff --git a/glib/src/Makefile.am b/glib/src/Makefile.am
index 5561d7bf..c184f0da 100644
--- a/glib/src/Makefile.am
+++ b/glib/src/Makefile.am
@@ -38,4 +38,4 @@ other_built_sources += $(patsubst %.m4,$(binding_outputdir)/%,$(files_src_m4))
dist_noinst_DATA += $(files_src_m4) template.macros.m4
$(binding_outputdir)/%: %.m4 template.macros.m4
- $(M4) -I$(srcdir) $< >$@
+ $(AM_V_GEN)$(M4) -I$(srcdir) $< >$@