[Xfce4-commits] <libxfce4util:master> Silent the build and fix remaining warnings.

[Nick Schermer]

Updating branch refs/heads/master
         to c56dcca567ac075253c6654690cf54b0135b926e (commit)
       from 3e1475533f00ad96a3388ff140b70130264d2124 (commit)

commit c56dcca567ac075253c6654690cf54b0135b926e
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Oct 23 17:09:45 2009 +0200

    Silent the build and fix remaining warnings.

 autogen.sh               |    2 +-
 configure.in.in          |   15 ++++++++++-----
 libxfce4util/Makefile.am |    6 +++---
 xfce4-kiosk-query/main.c |    2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6dd7849..26212d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,6 +18,6 @@ EOF
   exit 1
 }
 
-XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index 00fac3a..683ad4f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -30,7 +30,7 @@ dnl # YOU ARE DOING.
 
 
 dnl ********************************************
-dnl *** Full debug support for SVN snapshots ***
+dnl *** Full debug support for GIT snapshots ***
 dnl ********************************************
 m4_define([libxfce4util_debug_default], [ifelse(libxfce4util_version_tag(), [git], [full], [minimum])])
 
@@ -52,7 +52,8 @@ dnl ***************************
 LIBXFCE4UTIL_VERSION=libxfce4util_version()
 AM_INIT_AUTOMAKE([libxfce4util], [$LIBXFCE4UTIL_VERSION])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl **************************
 dnl *** Libtool versioning ***
@@ -108,9 +109,9 @@ dnl *** Check for i18n support ***
 dnl ******************************
 XDT_I18N([@LINGUAS@])
 
-dnl ******************************************************************************
-dnl *** Check for GObject >= 2.6.0 installed (GObject in turn depends on GLib) ***
-dnl ******************************************************************************
+dnl *********************************************************************
+dnl *** Check for GObject installed (GObject in turn depends on GLib) ***
+dnl *********************************************************************
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.12.0])
 
 dnl *************************
@@ -169,8 +170,12 @@ if test x"$enable_visibility" != x"no"; then
   AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
   AC_COMPILE_IFELSE(AC_LANG_SOURCE(
   [
+    void test_default (void);
+    void test_hidden (void);
+
     void __attribute__ ((visibility("default"))) test_default (void) {}
     void __attribute__ ((visibility("hidden"))) test_hidden (void) {}
+
     int main (int argc, char **argv) { test_default (); test_hidden (); return 0; }
   ]),
   [
diff --git a/libxfce4util/Makefile.am b/libxfce4util/Makefile.am
index 4eb6175..2f57dd5 100644
--- a/libxfce4util/Makefile.am
+++ b/libxfce4util/Makefile.am
@@ -120,12 +120,12 @@ libxfce4util-alias.h: make-libxfce4util-alias.pl libxfce4util.symbols
 	$(PERL) $(srcdir)/make-libxfce4util-alias.pl < $(srcdir)/libxfce4util.symbols > libxfce4util-alias.h
 
 libxfce4util-aliasdef.c: make-libxfce4util-alias.pl libxfce4util.symbols
-	$(PERL) $(srcdir)/make-libxfce4util-alias.pl -def < $(srcdir)/libxfce4util.symbols > libxfce4util-aliasdef.c
+	$(AM_V_GEN) $(PERL) $(srcdir)/make-libxfce4util-alias.pl -def < $(srcdir)/libxfce4util.symbols > libxfce4util-aliasdef.c
 
 libxfce4util-enum-types.h: stamp-libxfce4util-enum-types.h
 	@true
 stamp-libxfce4util-enum-types.h: $(libxfce4util_headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
 		--fhead "#ifndef __LIBXFCE4UTIL_ENUM_TYPES_H__\n#define __LIBXFCE4UTIL_ENUM_TYPES_H__\n#include <glib-object.h>\n" \
 		--fprod "/* enumerations from \"@filename@\" */\n" \
 		--vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
@@ -136,7 +136,7 @@ stamp-libxfce4util-enum-types.h: $(libxfce4util_headers) Makefile
 	&& echo timestamp > $(@F)
 
 libxfce4util-enum-types.c: $(libxfce4util_headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
 		--fhead "#include <libxfce4util/libxfce4util.h>\n#include <libxfce4util/libxfce4util-alias.h>\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {" \
diff --git a/xfce4-kiosk-query/main.c b/xfce4-kiosk-query/main.c
index 4cb318a..f6543c8 100644
--- a/xfce4-kiosk-query/main.c
+++ b/xfce4-kiosk-query/main.c
@@ -34,7 +34,7 @@
 #include <libxfce4util/libxfce4util.h>
 
 
-static void
+G_GNUC_NORETURN static void
 usage (gboolean error)
 {
   FILE *fp = error ? stderr : stdout;