From b6aaf88297734ec7e8086994280273037d5cd0a3 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 9 Jun 2010 10:10:52 +0000
Subject: [PATCH] - When compiling using automake >= 1.11, use the nicer
 `silent rules' output   format.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34632 a592a061-630c-0410-9148-cb99ea01b6c8
---
 configure.ac                  | 1 +
 src/frontends/qt4/Makefile.am | 8 ++++----
 status.16x                    | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index efd23517f1..6aab458a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index aaf24ce432..e8b9c4a3e5 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -11,22 +11,22 @@ CLEANFILES += $(BUILT_SOURCES)
 UIC4FLAGS=-tr lyx::qt_
 
 ui_%.h: ui/%.ui
-	$(UIC4) $(UIC4FLAGS) $< -o $@
+	$(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
 
 MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
 
 %_moc.cpp: %.h
-	$(MOC4) -o $@ $<
+	$(AM_V_GEN)$(MOC4) -o $@ $<
 
 Resources.qrc: Makefile
-	echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@
+	$(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@
 	find $(top_srcdir)/lib/images -name '*.png' \
 		| sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
 		>> $@
 	echo "</qresource></RCC>" >> $@
 
 Resources.cpp: Resources.qrc
-	$(RCC4) $< -name Resources -o $@
+	$(AM_V_GEN)$(RCC4) $< -name Resources -o $@
 
 
 #########################  LIBRARIES  #############################
diff --git a/status.16x b/status.16x
index c2cc213113..a18cd8da2e 100644
--- a/status.16x
+++ b/status.16x
@@ -142,4 +142,6 @@ What's new
 
 - CMake: Installs all but the binaries into the 'Resource' folder
 
+- When compiling using automake >= 1.11, use the nicer `silent rules' output
+  format.