From ec4c557c3cb384e03eb39d74f1c73081c176ba63 Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick@xfce.org>
Date: Fri, 26 Feb 2010 14:08:21 +0100
Subject: [PATCH] Use silent build rules.
---
configure.in.in | 8 +-------
panel/Makefile.am | 10 +++++-----
plugins/actions/Makefile.am | 2 +-
plugins/clock/Makefile.am | 2 +-
plugins/launcher/Makefile.am | 2 +-
plugins/pager/Makefile.am | 2 +-
plugins/separator/Makefile.am | 2 +-
plugins/systray/Makefile.am | 6 +++---
plugins/tasklist/Makefile.am | 2 +-
plugins/windowmenu/Makefile.am | 2 +-
wrapper/Makefile.am | 6 +++---
11 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index d80cfbf59..1a4d7e0c0 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -41,6 +41,7 @@ dnl ***************************
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl *******************************
dnl *** Check for UNIX variants ***
@@ -63,13 +64,6 @@ dnl **************************
AC_DISABLE_STATIC()
AC_PROG_LIBTOOL()
-dnl ****************************
-dnl *** Intltool-update hack ***
-dnl ****************************
-AC_CONFIG_COMMANDS([intltool-update],
- [(sed -e 's/^\("desktop.*".*\)/\1\n"rc(?:\\\\.in)+|"\./' intltool-update > intltool-update-tmp &&
- mv intltool-update-tmp intltool-update && chmod 755 intltool-update)])
-
dnl **************************************
dnl *** Substitute version information ***
dnl **************************************
diff --git a/panel/Makefile.am b/panel/Makefile.am
index c24cfaca8..65c5f084b 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -84,19 +84,19 @@ xfce4_panel_DEPENDENCIES = \
if MAINTAINER_MODE
panel-dbus-service-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
- dbus-binding-tool --prefix=panel_dbus_service --mode=glib-server $< > $@
+ $(AM_V_GEN) dbus-binding-tool --prefix=panel_dbus_service --mode=glib-server $< > $@
panel-dbus-client-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
- dbus-binding-tool --mode=glib-client $< > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $@
panel-preferences-dialog-ui.h: $(srcdir)/panel-preferences-dialog.ui Makefile
- exo-csource --static --strip-comments --strip-content --name=panel_preferences_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=panel_preferences_dialog_ui $< >$@
panel-marshal.h: $(srcdir)/panel-marshal.list Makefile
- glib-genmarshal --header --prefix=panel_marshal $< > $@
+ $(AM_V_GEN) glib-genmarshal --header --prefix=panel_marshal $< > $@
panel-marshal.c: $(srcdir)/panel-marshal.list Makefile
- echo "#include <panel/panel-marshal.h>" > $@ \
+ $(AM_V_GEN) echo "#include <panel/panel-marshal.h>" > $@ \
&& glib-genmarshal --body --prefix=panel_marshal $< >> $@
DISTCLEANFILES = \
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index 32336b551..d4c4a9780 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -70,7 +70,7 @@ DISTCLEANFILES += \
$(libactions_built_sources)
actions-dialog_ui.h: actions-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=actions_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=actions_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 9f3dcd33c..e40056269 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -82,7 +82,7 @@ DISTCLEANFILES += \
$(libclock_built_sources)
clock-dialog_ui.h: clock-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=clock_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=clock_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index 6a1a81aa7..682de3ace 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -80,7 +80,7 @@ DISTCLEANFILES += \
$(libclock_built_sources)
launcher-dialog_ui.h: launcher-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=launcher_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=launcher_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index 0d53003a8..08cbaab00 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -73,7 +73,7 @@ DISTCLEANFILES += \
$(libpager_built_sources)
pager-dialog_ui.h: pager-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=pager_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=pager_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index f03db0c38..9c88b1808 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -72,7 +72,7 @@ DISTCLEANFILES += \
$(libseparator_built_sources)
separator-dialog_ui.h: separator-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=separator_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=separator_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 78713eba5..ec2f2f8b4 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -84,14 +84,14 @@ DISTCLEANFILES += \
$(libsystray_built_sources)
systray-marshal.h: systray-marshal.list Makefile
- glib-genmarshal --header --internal --prefix=_systray_marshal $< > $@
+ $(AM_V_GEN) glib-genmarshal --header --internal --prefix=_systray_marshal $< > $@
systray-marshal.c: systray-marshal.list Makefile
- echo "#include \"systray-marshal.h\"" > $@ \
+ $(AM_V_GEN) echo "#include \"systray-marshal.h\"" > $@ \
&& glib-genmarshal --prefix=_systray_marshal --body $< >> $@
systray-dialog_ui.h: systray-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=systray_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=systray_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index ed8cbcbd2..e0b3bc24e 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -74,7 +74,7 @@ DISTCLEANFILES += \
$(libtasklist_built_sources)
tasklist-dialog_ui.h: tasklist-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=tasklist_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=tasklist_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 1c2dcfe39..3d016b1ba 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -73,7 +73,7 @@ DISTCLEANFILES += \
$(libwindowmenu_built_sources)
windowmenu-dialog_ui.h: windowmenu-dialog.ui
- exo-csource --static --strip-comments --strip-content --name=windowmenu_dialog_ui $< >$@
+ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=windowmenu_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 5bb64846a..4a5962b51 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -52,13 +52,13 @@ xfce4_panel_wrapper_DEPENDENCIES = \
if MAINTAINER_MODE
wrapper-dbus-client-infos.h: $(top_builddir)/panel/panel-dbus-service-infos.xml Makefile
- dbus-binding-tool --mode=glib-client $< > $@
+ $(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $@
wrapper-marshal.h: $(top_builddir)/panel/panel-marshal.list Makefile
- glib-genmarshal --header --prefix=wrapper_marshal $< > $@
+ $(AM_V_GEN)glib-genmarshal --header --prefix=wrapper_marshal $< > $@
wrapper-marshal.c: $(top_builddir)/panel/panel-marshal.list Makefile
- echo "#include <wrapper/wrapper-marshal.h>" > $@ \
+ $(AM_V_GEN) echo "#include <wrapper/wrapper-marshal.h>" > $@ \
&& glib-genmarshal --body --prefix=wrapper_marshal $< >> $@
BUILT_SOURCES = \
--
GitLab