[poppler] configure.ac glib/Makefile.am Makefile.am qt4/demos qt4/src qt4/tests

[Albert Astals Cid]

 Makefile.am           |    2 +-
 configure.ac          |    1 +
 glib/Makefile.am      |    4 ++--
 qt4/demos/Makefile.am |    2 +-
 qt4/src/Makefile.am   |    2 +-
 qt4/tests/Makefile.am |    2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc
Author: Christian Persch <chpe at gnome.org>
Date:   Tue Aug 25 21:03:16 2009 +0200

    Support AM_SILENT_RULES
    
    When using automake 1.11, should support silent build rules.

diff --git a/Makefile.am b/Makefile.am
index a4ab01f..2a75262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,4 +89,4 @@ EXTRA_DIST +=							\
 dist-hook: ChangeLog
 
 ChangeLog : .git/HEAD
-	git log --stat > ChangeLog
+	$(AM_V_GEN) git log --stat > ChangeLog
diff --git a/configure.ac b/configure.ac
index 3d53bb2..2b51f51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AC_PREREQ(2.59)
 AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(poppler/poppler-config.h)
 
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 1548ce1..3c065fe 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -29,13 +29,13 @@ poppler-enums.h: stamp-poppler-enums.h
 	@true
 
 stamp-poppler-enums.h: poppler-enums.h.template $(poppler_glib_public_headers)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
 	&& (cmp -s xgen-etbh poppler-enums.h || cp xgen-etbh poppler-enums.h ) \
 	&& rm -f xgen-etbh \
 	&& echo timestamp > $(@F)
 
 poppler-enums.c: poppler-enums.c.template $(poppler_glib_public_headers)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
 	&& (cmp -s xgen-etbc poppler-enums.c || cp xgen-etbc poppler-enums.c ) \
 	&& rm -f xgen-etbc
 
diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
index 140d62c..c3f636c 100644
--- a/qt4/demos/Makefile.am
+++ b/qt4/demos/Makefile.am
@@ -16,7 +16,7 @@ SUFFIXES: .moc
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 noinst_PROGRAMS = poppler_qt4viewer
 
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index a761232..1aa00ef 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -65,7 +65,7 @@ libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 poppler-optcontent.lo: poppler-optcontent.moc
 
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index ac8213c..763b177 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -15,7 +15,7 @@ LDADDS =					\
 SUFFIXES: .moc
 
 .cpp.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 noinst_PROGRAMS = test-poppler-qt4 stress-poppler-qt4 \
 	poppler-fonts test-password-qt4 stress-poppler-dir \