/soc/2013/ankitkv/gobjectification: f61c3e4338c4: Merged soc.201...

Tue Sep 3 11:32:21 EDT 2013

Changeset: f61c3e4338c431d47d947d62cab7a78558e8399d
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-03 21:02 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f61c3e4338c4

Description:

Merged soc.2013.gobjectification branch

diffstat:

 Makefile.am                                  |  6 +++++-
 autogen.sh                                   |  4 +++-
 finch/libgnt/Makefile.am                     |  8 +++-----
 libpurple/gconf/Makefile.am                  |  5 ++++-
 libpurple/http.c                             |  3 +++
 libpurple/plugins/Makefile.am                |  6 ++----
 libpurple/plugins/perl/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 +-
 pidgin/plugins/musicmessaging/Makefile.am    |  6 ++----
 pidgin/plugins/perl/Makefile.am              |  5 ++---
 12 files changed, 29 insertions(+), 25 deletions(-)

diffs (192 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/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -151,7 +151,9 @@ run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GET
 run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
 # This call to sed is needed to work around an annoying bug in intltool 0.40.6
 # See https://developer.pidgin.im/ticket/9520 for details
-run_or_die ${SED} -i.bak -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+run_or_die ${SED} -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+# glib-gettextize doesn't seems to use AM_V_GEN macro
+${SED} -i -e "s:\\tfile=\`echo:\\t at echo -e \"  GEN\\\\t\$\@\"; file=\`echo:g" po/Makefile.in.in
 run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}
diff --git a/finch/libgnt/Makefile.am b/finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am
+++ b/finch/libgnt/Makefile.am
@@ -73,13 +73,11 @@ CLEANFILES = \
 	gntmarshal.c
 
 gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
-	@echo -e "  GEN\t$@"
-	@echo "#include \"gntmarshal.h\"" > $@
-	@glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
+	$(AM_V_GEN)echo "#include \"gntmarshal.h\"" > $@
+	$(AM_V_at)glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
 
 gntmarshal.h: $(srcdir)/genmarshal
-	@echo -e "  GEN\t$@"
-	@glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
+	$(AM_V_GEN)glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
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/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -34,6 +34,9 @@
 #include "purple-socket.h"
 
 #include <zlib.h>
+#ifndef z_const
+#define z_const
+#endif
 
 #define PURPLE_HTTP_URL_CREDENTIALS_CHARS "a-z0-9.,~_/*!&%?=+\\^-"
 #define PURPLE_HTTP_MAX_RECV_BUFFER_LEN 10240
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -124,12 +124,10 @@ SUBDIRS = \
 #.PHONY: always
 #
 #$(top_builddir)/libpurple/dbus-types.h: always
-#	@echo -e "  GEN\t$@"
-#	@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+#	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 #
 #dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
-#	@echo -e "  GEN\t$@"
-#	@cat $(srcdir)/$(dbus_example_la_SOURCES) | \
+#	$(AM_V_GEN)cat $(srcdir)/$(dbus_example_la_SOURCES) | \
 #	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 #
 #$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libpurple/dbus-types.h
diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -92,15 +92,14 @@ EXTRA_DIST = \
 	$(perl_scripts)
 
 common/Makefile: common/Makefile.PL
-	@echo -e "  GEN\t$@"
-	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
+	$(AM_V_GEN)if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
 			srcloc=${srcdir}; \
 			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL > /dev/null
+	$(AM_V_at)cd common && $(perlpath) Makefile.PL > /dev/null
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
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=/' \
 	$< > $@
diff --git a/pidgin/plugins/musicmessaging/Makefile.am b/pidgin/plugins/musicmessaging/Makefile.am
--- a/pidgin/plugins/musicmessaging/Makefile.am
+++ b/pidgin/plugins/musicmessaging/Makefile.am
@@ -23,12 +23,10 @@ CLEANFILES              = music-messagin
 .PHONY: always
 
 $(top_builddir)/libpurple/dbus-types.h: always
-	@echo -e "  GEN\t$@"
-	@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
 music-messaging-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
-	@echo -e "  GEN\t$@"
-	@cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
+	$(AM_V_GEN)cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
 	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
 $(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/libpurple/dbus-types.h
diff --git a/pidgin/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -37,15 +37,14 @@ EXTRA_DIST = \
 	$(common_sources)
 
 common/Makefile: common/Makefile.PL
-	@echo -e "  GEN\t$@"
-	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
+	$(AM_V_GEN)if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
 			srcloc=${srcdir}; \
 			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
 			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
-	@cd common && $(perlpath) Makefile.PL > /dev/null
+	$(AM_V_at)cd common && $(perlpath) Makefile.PL > /dev/null
 
 common/Makefile.PL: common/Makefile.PL.in $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)

