/pidgin/main: dc7890ea7560: Silence a clean build (hg purge --all)
Tomasz Wasilczyk
twasilczyk at pidgin.im
Tue Sep 3 07:52:09 EDT 2013
Changeset: dc7890ea75603401eeec67f9096e2bd8d90d04b3
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2013-09-03 13:51 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/dc7890ea7560
Description:
Silence a clean build (hg purge --all)
diffstat:
Makefile.am | 6 +++++-
libpurple/gconf/Makefile.am | 5 ++++-
pidgin/pixmaps/emotes/default/24/Makefile.am | 2 +-
pidgin/pixmaps/emotes/none/Makefile.am | 2 +-
pidgin/pixmaps/emotes/small/16/Makefile.am | 2 +-
5 files changed, 12 insertions(+), 5 deletions(-)
diffs (67 lines):
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,11 @@ if ENABLE_GTK
appsdir = $(datadir)/applications
apps_in_files = pidgin.desktop.in
apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
+
+# silenced INTLTOOL_DESKTOP_RULE
+%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+ $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
+
endif #ENABLE_GTK
endif #INSTALL_I18N
diff --git a/libpurple/gconf/Makefile.am b/libpurple/gconf/Makefile.am
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
@@ -5,7 +5,10 @@ EXTRA_DIST = purple.schemas.in
if INSTALL_I18N
schema_in_files = purple.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
- at INTLTOOL_SCHEMAS_RULE@
+
+# silenced INTLTOOL_SCHEMAS_RULE
+%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+ $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
if GCONF_SCHEMAS_INSTALL
install-data-local:
diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.am b/pidgin/pixmaps/emotes/default/24/Makefile.am
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am
@@ -205,7 +205,7 @@ pidginsmileypix_DATA = \
theme
theme: default.theme.in
- sed -e 's/^_Name=/Name=/' \
+ $(AM_V_GEN) sed -e 's/^_Name=/Name=/' \
-e 's/^_Description=/Description=/' \
-e 's/^_Author=/Author=/' \
$< > $@
diff --git a/pidgin/pixmaps/emotes/none/Makefile.am b/pidgin/pixmaps/emotes/none/Makefile.am
--- a/pidgin/pixmaps/emotes/none/Makefile.am
+++ b/pidgin/pixmaps/emotes/none/Makefile.am
@@ -5,7 +5,7 @@ pidginsmileypixdir = $(datadir)/pixmaps/
pidginsmileypix_DATA = theme
theme: none.theme.in
- sed -e 's/^_Name=/Name=/' \
+ $(AM_V_GEN) sed -e 's/^_Name=/Name=/' \
-e 's/^_Description=/Description=/' \
-e 's/^_Author=/Author=/' \
$< > $@
diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am
@@ -94,7 +94,7 @@ pidginsmileypix_DATA = \
theme
theme: small.theme.in
- sed -e 's/^_Name=/Name=/' \
+ $(AM_V_GEN) sed -e 's/^_Name=/Name=/' \
-e 's/^_Description=/Description=/' \
-e 's/^_Author=/Author=/' \
$< > $@
More information about the Commits
mailing list