[gnote/stable-0.8] Replace shave with automake's silent rules

[Aurimas Äernius <aurimasc src gnome org>]

commit bd2d9b24b234906fa4d74f197d28ae7286c88e29
Author: Adrian Bunk <bunk stusta de>
Date:   Thu Apr 19 23:33:14 2012 +0300

    Replace shave with automake's silent rules
    
    Fixes bug 673710.
    Thanks Adrian Bunk.

 .gitignore       |    2 -
 autogen.sh       |    2 +-
 configure.ac     |    7 +----
 data/Makefile.am |    2 +-
 m4/shave.m4      |   40 ------------------------------
 shave-libtool.in |   70 ------------------------------------------------------
 shave.in         |   70 ------------------------------------------------------
 7 files changed, 4 insertions(+), 189 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49b084c..394dce6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,6 @@ depcomp
 missing
 autom4te.cache
 autogen.err
-shave
-shave-libtool
 stamp-*
 aclocal.m4
 gnome-doc-utils.make
diff --git a/autogen.sh b/autogen.sh
index 9f7554f..7f9e45e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.11 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 8359700..61ac356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 AC_INIT(gnote, 0.8.4)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(README)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2])
+AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 
 GNOME_COMMON_INIT
@@ -170,12 +171,8 @@ AC_SUBST(GNOTE_LOCALEDIR)
 
 AC_DEFINE_UNQUOTED([GNOTE_BUILD_CONFIG], ["$GNOTE_BUILD_CONFIG"], [The string used to hardcode the build config.])
 
-SHAVE_INIT
-
 AC_CONFIG_FILES([
 Makefile
-shave
-shave-libtool
 data/Makefile
 data/gnote.desktop.in
 data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 8fa546d..e96dc54 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,7 +25,7 @@ dbusservice_in_files = org.gnome.Gnote.service.in
 dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
 
 $(dbusservice_DATA): $(dbusservice_in_files) Makefile
-	sed -e "s|\ bindir\@|$(bindir)|g"	\
+	$(AM_V_GEN)sed -e "s|\ bindir\@|$(bindir)|g"	\
 	    -e "s|\ wrapper\@|gnote|g"		\
 	    < $< > $@