Updating branch refs/heads/nick/garcon to 487ed68aa04032f043a2958893ce6fbe2acdb742 (commit) from 2ac405d20e71838c54bb1133468b93d8d1435296 (commit)
commit 487ed68aa04032f043a2958893ce6fbe2acdb742 Author: Nick Schermer <n...@xfce.org> Date: Fri Aug 27 17:14:12 2010 +0200 Silent build. configure.ac.in | 1 + settings/Makefile.am | 2 +- src/Makefile.am | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 5550ad2..16fd1f1 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -35,6 +35,7 @@ XFDESKTOP_VERSION=xfdesktop_version AM_INIT_AUTOMAKE([xfdesktop], [$XFDESKTOP_VERSION]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl check for UNIX variants AC_AIX diff --git a/settings/Makefile.am b/settings/Makefile.am index e169eda..4897f44 100644 --- a/settings/Makefile.am +++ b/settings/Makefile.am @@ -48,7 +48,7 @@ BUILT_SOURCES = \ SUFFIXES: .ui %-ui.h: $(srcdir)/%-ui.xml Makefile - exo-csource --static --name=`basename $< .xml | sed -e 's/-/_/g'` $< >$@ + $(AM_V_GEN) exo-csource --static --name=`basename $< .xml | sed -e 's/-/_/g'` $< >$@ endif diff --git a/src/Makefile.am b/src/Makefile.am index b971a9d..85ee55b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -141,10 +141,10 @@ DISTCLEANFILES = $(BUILT_SOURCES) xfdesktop-marshal.h: stamp-xfdesktop-marshal.h @true stamp-xfdesktop-marshal.h: xfdesktop-marshal.list Makefile - glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --header > xfdesktop-marshal.h + $(AM_V_GEN) glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --header > xfdesktop-marshal.h && \ echo timestamp > $(@F) xfdesktop-marshal.c: xfdesktop-marshal.list Makefile - echo '#include "xfdesktop-marshal.h"' > xfdesktop-marshal.c + $(AM_V_GEN) echo '#include "xfdesktop-marshal.h"' > xfdesktop-marshal.c && \ glib-genmarshal --prefix=xfdesktop_marshal xfdesktop-marshal.list --body >> xfdesktop-marshal.c enum_headers = \ @@ -154,7 +154,7 @@ enum_headers = \ xfce-desktop-enum-types.h: stamp-xfce-desktop-enum-types.h @true stamp-xfce-desktop-enum-types.h: $(enum_headers) Makefile - ( cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \ --fhead "#ifndef __XFCE_DESKTOP_ENUM_TYPES_H__\n#define __XFCE_DESKTOP_ENUM_TYPES_H__\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filen...@\" */\n" \ --vhead "GType @enum_n...@_get_type (void) G_GNUC_CONST;\n#define xfce_ty...@enumshort@ (@enum_n...@_get_type())\n" \ @@ -164,7 +164,7 @@ stamp-xfce-desktop-enum-types.h: $(enum_headers) Makefile && rm -f xgen-xdeth \ && echo timestamp > $(@F) xfce-desktop-enum-types.c: $(enum_headers) Makefile - ( cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \ --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"xfce-desktop.h\"\n#include \"xfce-backdrop.h\"\n#include \"xfce-desktop-enum-types.h\"" \ --fprod "\n/* enumerations from \"@filen...@\" */" \ --vhead "gtyp...@enum_name@_get_type (void)\n{\n\tstatic GType type = 0;\n\tif (type == 0) {\n\tstatic const g...@type@Value values[] = {"\ @@ -185,10 +185,10 @@ DISTCLEANFILES += \ xfdesktop-dbus-bindings-trash.h xfdesktop-dbus-bindings-filemanager.h: $(srcdir)/xfdesktop-dbus-bindings-filemanager.xml Makefile - dbus-binding-tool --mode=glib-client --prefix=org_xfce_FileManager $(srcdir)/xfdesktop-dbus-bindings-filemanager.xml > xfdesktop-dbus-bindings-filemanager.h + $(AM_V_GEN) dbus-binding-tool --mode=glib-client --prefix=org_xfce_FileManager $(srcdir)/xfdesktop-dbus-bindings-filemanager.xml > xfdesktop-dbus-bindings-filemanager.h xfdesktop-dbus-bindings-trash.h: $(srcdir)/xfdesktop-dbus-bindings-trash.xml Makefile - dbus-binding-tool --mode=glib-client --prefix=org_xfce_Trash $(srcdir)/xfdesktop-dbus-bindings-trash.xml > xfdesktop-dbus-bindings-trash.h + $(AM_V_GEN) dbus-binding-tool --mode=glib-client --prefix=org_xfce_Trash $(srcdir)/xfdesktop-dbus-bindings-trash.xml > xfdesktop-dbus-bindings-trash.h endif _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits