[gnome-characters] build: Update gnulib files to silence gperf

[Daiki Ueno <dueno src gnome org>]

commit 5971a9ca32c46588563b8ba7ffa78fb0da0a9d63
Author: Daiki Ueno <dueno src gnome org>
Date:   Tue Aug 18 12:38:17 2015 +0900

    build: Update gnulib files to silence gperf

 gllib/Makefile.am     |    9 ++++++---
 glm4/gnulib-common.m4 |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gllib/Makefile.am b/gllib/Makefile.am
index 43b626f..f848bd7 100644
--- a/gllib/Makefile.am
+++ b/gllib/Makefile.am
@@ -64,6 +64,9 @@ HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
 ## begin gnulib module gperf
 
 GPERF = gperf
+V_GPERF = $(V_GPERF_ AM_V@)
+V_GPERF_ = $(V_GPERF_ AM_DEFAULT_V@)
+V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## end   gnulib module gperf
 
@@ -697,7 +700,7 @@ libgnu_la_SOURCES += unictype/categ_byname.c
 endif
 
 unictype/categ_byname.h: unictype/categ_byname.gperf
-       $(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t 
&& \
        mv $(srcdir)/unictype/categ_byname.h-t $(srcdir)/unictype/categ_byname.h
 BUILT_SOURCES        += unictype/categ_byname.h
 MOSTLYCLEANFILES     += unictype/categ_byname.h-t
@@ -977,7 +980,7 @@ libgnu_la_SOURCES += unictype/pr_byname.c
 endif
 
 unictype/pr_byname.h: unictype/pr_byname.gperf
-       $(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t && \
        mv $(srcdir)/unictype/pr_byname.h-t $(srcdir)/unictype/pr_byname.h
 BUILT_SOURCES        += unictype/pr_byname.h
 MOSTLYCLEANFILES     += unictype/pr_byname.h-t
@@ -1673,7 +1676,7 @@ libgnu_la_SOURCES += unictype/scripts.c
 endif
 
 unictype/scripts_byname.h: unictype/scripts_byname.gperf
-       $(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > 
$(srcdir)/unictype/scripts_byname.h-t && \
        mv $(srcdir)/unictype/scripts_byname.h-t $(srcdir)/unictype/scripts_byname.h
 BUILT_SOURCES        += unictype/scripts_byname.h
 MOSTLYCLEANFILES     += unictype/scripts_byname.h-t
diff --git a/glm4/gnulib-common.m4 b/glm4/gnulib-common.m4
index b301abe..40e82f6 100644
--- a/glm4/gnulib-common.m4
+++ b/glm4/gnulib-common.m4
@@ -278,12 +278,12 @@ Amsterdam
       dnl but prefer ${host}-ar over ar (useful for cross-compiling).
       AC_CHECK_TOOL([AR], [ar], [ar])
       if test -z "$ARFLAGS"; then
-        ARFLAGS='cru'
+        ARFLAGS='cr'
       fi
     fi
   else
     if test -z "$ARFLAGS"; then
-      ARFLAGS='cru'
+      ARFLAGS='cr'
     fi
   fi
   AC_SUBST([AR])