[telepathy-qt4/master] Fix compilation with Automake <= 1.11

Will Thompson will.thompson at collabora.co.uk
Wed Jan 13 05:56:08 PST 2010


TPQT4_V_MOC_ was defined in terms of $(AM_DEFAULT_VERBOSITY) which is
of course not defined with older automakes, so expanded to nothing, so
TPQT4_V_MOC_ was defined to be … itself. This patch effectively defaults
$(AM_DEFAULT_VERBOSITY) to 0 in older Automakes.

I tried to make all the definitions conditional on
$(AM_DEFAULT_VERBOSITY) being defined, but failed because this Makefile
is included by .am files, so Automake sees the 'ifdef' / 'endif' pair,
doesn't recognise 'ifdef' but does recognise 'endif' so gets upset.

Reviewed-by: André Moreira Magalhães <andre.magalhaes at collabora.co.uk>
---
 tools/telepathy-qt4.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/telepathy-qt4.mk b/tools/telepathy-qt4.mk
index 58c13e0..ce95363 100644
--- a/tools/telepathy-qt4.mk
+++ b/tools/telepathy-qt4.mk
@@ -1,4 +1,4 @@
 TPQT4_V_MOC = $(TPQT4_V_MOC_$(V))
-TPQT4_V_MOC_ = $(TPQT4_V_MOC_$(AM_DEFAULT_VERBOSITY))
+TPQT4_V_MOC_ = $(TPQT4_V_MOC_$(or $(AM_DEFAULT_VERBOSITY), 1))
 TPQT4_V_MOC_0 = @echo '  MOC   ' $@;
 
-- 
1.5.6.5



More information about the telepathy-commits mailing list