[eog-plugins] Support intltool-merge in silent-rules

[Felix Riemann <friemann src gnome org>]

commit 74e8e2d38c14c5b4189b8e3975a511d93008d3ab
Author: Felix Riemann <friemann gnome org>
Date:   Tue Aug 11 14:44:06 2009 +0200

    Support intltool-merge in silent-rules

 plugins/champlain/Makefile.am        |    2 +-
 plugins/exif-display/Makefile.am     |    4 ++--
 plugins/fit-to-width/Makefile.am     |    2 +-
 plugins/postr/Makefile.am            |    2 +-
 plugins/pythonconsole/Makefile.am    |    2 +-
 plugins/slideshowshuffle/Makefile.am |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/champlain/Makefile.am b/plugins/champlain/Makefile.am
index 290b059..48f56e8 100644
--- a/plugins/champlain/Makefile.am
+++ b/plugins/champlain/Makefile.am
@@ -23,7 +23,7 @@ libchamplain_la_LDFLAGS = \
 
 plugin_in_files = champlain.eog-plugin.desktop.in
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
diff --git a/plugins/exif-display/Makefile.am b/plugins/exif-display/Makefile.am
index 4442592..83d3d7e 100644
--- a/plugins/exif-display/Makefile.am
+++ b/plugins/exif-display/Makefile.am
@@ -29,11 +29,11 @@ UI_FILES = exif-display.ui exif-display-config.ui
 ui_DATA = $(UI_FILES)
 uidir = $(plugindir)/exif-display
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
 EXTRA_DIST = $(plugin_in_files) $(UI_FILES)
 
-CLEANFILES = #$(plugin_DATA)
+CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
diff --git a/plugins/fit-to-width/Makefile.am b/plugins/fit-to-width/Makefile.am
index 1b68381..9f75e7e 100644
--- a/plugins/fit-to-width/Makefile.am
+++ b/plugins/fit-to-width/Makefile.am
@@ -22,7 +22,7 @@ libfit_to_width_la_LIBADD = $(EOG_LIBS)
 
 plugin_in_files = fit-to-width.eog-plugin.desktop.in
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
diff --git a/plugins/postr/Makefile.am b/plugins/postr/Makefile.am
index 7833cdf..64dda13 100644
--- a/plugins/postr/Makefile.am
+++ b/plugins/postr/Makefile.am
@@ -21,7 +21,7 @@ libpostr_la_LDFLAGS = \
 
 plugin_in_files = postr.eog-plugin.desktop.in
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index 8c82d67..87ef578 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -6,7 +6,7 @@ plugin_PYTHON = \
 	pythonconsole.py \
 	console.py
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
diff --git a/plugins/slideshowshuffle/Makefile.am b/plugins/slideshowshuffle/Makefile.am
index 622aa73..812581f 100644
--- a/plugins/slideshowshuffle/Makefile.am
+++ b/plugins/slideshowshuffle/Makefile.am
@@ -5,7 +5,7 @@ plugin_in_files = slideshowshuffle.eog-plugin.desktop.in
 plugin_PYTHON = \
 	slideshowshuffle.py
 
-%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.eog-plugin.desktop.in=.eog-plugin)