/pidgin/main: 299c414a14c1: Use AM_V_GEN macro where appropriate

Tomasz Wasilczyk twasilczyk at pidgin.im
Tue Sep 3 08:26:07 EDT 2013


Changeset: 299c414a14c10138e3035b9bf2ec22a21e77c16a
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-09-03 14:25 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/299c414a14c1

Description:

Use AM_V_GEN macro where appropriate

diffstat:

 finch/libgnt/Makefile.am                  |  8 +++-----
 libpurple/plugins/Makefile.am             |  6 ++----
 libpurple/plugins/perl/Makefile.am        |  5 ++---
 pidgin/plugins/musicmessaging/Makefile.am |  6 ++----
 pidgin/plugins/perl/Makefile.am           |  5 ++---
 5 files changed, 11 insertions(+), 19 deletions(-)

diffs (98 lines):

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/plugins/Makefile.am b/libpurple/plugins/Makefile.am
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -118,12 +118,10 @@ dbus_example_la_LIBADD      = $(GLIB_LIB
 .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/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)



More information about the Commits mailing list