From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 30 Nov 2009 14:18:25 +0000 (+0000)
Subject: Enable "silent rules" with automake 1.11. This leads to much nicer compilation
X-Git-Tag: 2.0.0~4989
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e4a483da32395f805ac8de48f4ee78e50a8b50fb;p=lyx.git

Enable "silent rules" with automake 1.11. This leads to much nicer compilation
output. The build should still work with older automake versions.

The po/ directory does not have the nice rules, because I do not want to
modify Makefile.in.in therein.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32241 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/configure.ac b/configure.ac
index e8dfe8face..7cfe26ea31 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
 
 # Allow to build some parts of the code as one big chunk
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 55f25f404e..0a5a384f7b 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  #############################