pidgin: 3e7f2279: Enable silent build rules. You can disab...
qulogic at pidgin.im
qulogic at pidgin.im
Sat Jul 3 19:50:55 EDT 2010
----------------------------------------------------------------------
Revision: 3e7f2279dc6c1caa056e4346e019dfdaab8af2b2
Parent: b433a91177be6f0059cd466f9939f7a904b717a9
Author: qulogic at pidgin.im
Date: 07/01/10 20:32:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3e7f2279dc6c1caa056e4346e019dfdaab8af2b2
Changelog:
Enable silent build rules. You can disable them using the configure
option --disable-silent-rules, or by specifying `make V=1` when
building.
Changes against parent b433a91177be6f0059cd466f9939f7a904b717a9
patched ChangeLog
patched Makefile.am
patched configure.ac
patched libpurple/Makefile.am
-------------- next part --------------
============================================================
--- ChangeLog 24ea2105d2f6b3a11e6f36aefed9ad20473ce5f5
+++ ChangeLog 46ac4a25de942363cbf8aa98323bddddc3848e32
@@ -1,6 +1,11 @@ version 2.7.2 (??/??/????):
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
version 2.7.2 (??/??/????):
+ General:
+ * Use silent build rules for automake >1.11. You can enable verbose
+ builds with the --disable-silent-rules configure option, or using
+ make V=1.
+
libpurple:
* Fix the TURN server settings (broken in 2.7.0).
============================================================
--- Makefile.am 042cd4f1a587ff1633aaed103f0874c7cec999c6
+++ Makefile.am fcbb5a8b0528f430b95a912fafa38f97fda19125
@@ -100,18 +100,18 @@ package_revision_raw.txt:
# creates, and also make sure that the shell command exits
# successfully; the rm -f ensures both
package_revision_raw.txt:
- REAL_BLDDIR=$$PWD/$(top_builddir); \
+ $(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
(cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
|| (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
|| rm -f $@
package_revision.h: package_revision_raw.txt
- if test -f $<; then \
+ $(AM_V_GEN)if test -f $<; then \
echo "#define REVISION \"`cat $<`\"" > $@; \
fi
- if test ! -f $@ -a -f $(srcdir)/$@; then \
+ $(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
cp $(srcdir)/$@ $@; \
fi
- test -f $@ || echo "#define REVISION \"unknown\"" > $@
+ $(AM_V_at)test -f $@ || echo "#define REVISION \"unknown\"" > $@
# This is a magic directive copy-and-pasted, then modified, from the
# automake 1.9 manual, section 13.4, "Checking the distribution".
============================================================
--- configure.ac 6b1bf3289cfb010a74d2b752be176e8567123865
+++ configure.ac 5e70dd61763e64c24d1b7abb832541e722470080
@@ -75,6 +75,8 @@ AM_INIT_AUTOMAKE([1.9 -Wno-portability d
AC_CANONICAL_HOST
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
+dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
PURPLE_MAJOR_VERSION=purple_major_version
PURPLE_MINOR_VERSION=purple_minor_version
============================================================
--- libpurple/Makefile.am 9d19293ff56000141a9796be5417bd428b211305
+++ libpurple/Makefile.am c1f7e9c3096c60434341bff05ce1d99f4b42527f
@@ -170,13 +170,11 @@ marshallers.h: marshallers.list
purple_builtheaders = purple.h version.h marshallers.h
marshallers.h: marshallers.list
- @echo "Generating marshallers.h"
- $(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
+ $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
marshallers.c: marshallers.list marshallers.h
- @echo "Generating marshallers.c"
- echo "#include \"marshallers.h\"" > marshallers.c
- $(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
+ $(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
+ $(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
if ENABLE_DBUS
@@ -212,16 +210,16 @@ dbus-types.c: dbus-analyze-types.py $(pu
$(srcdir)/protocols/jabber/libxmpp.c
dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
- cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
+ $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
- cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
+ $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
- cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
+ $(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
- cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
+ $(AM_V_GEN)cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
@@ -236,11 +234,11 @@ purple-client-bindings.c: dbus-analyze-f
libpurple_client_la_LIBADD = $(DBUS_LIBS)
purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
- cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
+ $(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
- cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
- cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
+ $(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
+ $(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
$(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
More information about the Commits
mailing list