- 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

@@ -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

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  #############################

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.