[vlc-devel] commit: Silence uic, moc and rcc (Christophe Mutricy )

git version control git at videolan.org
Sat Oct 3 01:11:55 CEST 2009


vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sat Oct  3 00:00:41 2009 +0100| [c8f3f099e5d8b816e4b63f8dcb147d4f06008154] | committer: Christophe Mutricy 

Silence uic, moc and rcc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8f3f099e5d8b816e4b63f8dcb147d4f06008154
---

 modules/gui/qt4/Modules.am |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 37e8695..86dae81 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -179,19 +179,27 @@ DEPS_res = \
 
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
 
+moc_verbose = $(moc_verbose_$(V))
+moc_verbose_ = $(moc_verbose_$(AM_DEFAULT_VERBOSITY))
+moc_verbose_0 = @echo "  MOC   " $@;
+
+uic_verbose = $(uic_verbose_$(V))
+uic_verbose_ = $(uic_verbose_$(AM_DEFAULT_VERBOSITY))
+uic_verbose_0 = @echo "  UIC   " $@;
+
 resources.cpp: vlc.qrc $(DEPS_res)
-	$(RCC) -name vlc -o $@ $<
+	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-	$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+	$(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
-	mkdir -p -- ui
-	rm -f $@ $@.tmp
-	echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
-	$(UIC) -tr "Q_" $< >> $@.tmp
-	sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
-	rm -f $@.tmp
+	$(AM_V_at)mkdir -p -- ui
+	$(AM_V_at)rm -f $@ $@.tmp
+	$(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
+	$(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
+	$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+	$(AM_V_at)rm -f $@.tmp
 
 SOURCES_qt4 = 	qt4.cpp \
 		menus.cpp \




More information about the vlc-devel mailing list