Enable "silent rules" with automake 1.11. This leads to much nicer compilation

[lyx.git] / src / frontends / qt4 / Makefile.am

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 634e336ce8b545c9988b76e08cf2fe19973a6986..0a5a384f7bab28151541d5ddb593e5dbd08d5807 100644 (file)
--- 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  #############################
@@ -73,6 +73,7 @@ SOURCEFILES = \
        GuiClipboard.cpp \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
+       GuiCompare.cpp \
        GuiCompleter.cpp \
        GuiDelimiter.cpp \
        GuiDialog.cpp \
@@ -132,6 +133,7 @@ SOURCEFILES = \
        LengthCombo.cpp \
        LyXFileDialog.cpp \
        LaTeXHighlighter.cpp \
+       LayoutBox.cpp \
        Menus.cpp \
        PanelStack.cpp \
        qt_helpers.cpp \
@@ -178,6 +180,7 @@ MOCHEADER = \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
+       GuiCompare.h \
        GuiCompleter.h \
        GuiDelimiter.h \
        GuiDialog.h \
@@ -227,6 +230,7 @@ MOCHEADER = \
        GuiWrap.h \
        IconPalette.h \
        InsertTableWidget.h \
+       LayoutBox.h \
        LengthCombo.h \
        LyXFileDialog.h \
        Menus.h \
@@ -244,11 +248,13 @@ UIFILES = \
        BibtexUi.ui \
        BoxUi.ui \
        BranchesUi.ui \
+       BranchesUnknownUi.ui \
        BranchUi.ui \
        BulletsUi.ui \
        ChangesUi.ui \
        CharacterUi.ui \
        CitationUi.ui \
+       CompareUi.ui \
        DelimiterUi.ui \
        DocumentUi.ui \
        ErrorListUi.ui \
@@ -269,6 +275,7 @@ UIFILES = \
        LanguageUi.ui \
        LaTeXUi.ui \
        ListingsUi.ui \
+       ListingsSettingsUi.ui \
        LogUi.ui \
        MarginsUi.ui \
        MathMatrixUi.ui \