X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMakefile.am;h=a1fbf59e02b4d43f2e6e6015d27f6bc52f5f71ef;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=634e336ce8b545c9988b76e08cf2fe19973a6986;hpb=e9cbe2f80f766d3a31891840915e2dc311ac516d;p=lyx.git

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 634e336ce8..a1fbf59e02 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  #############################
@@ -73,6 +73,7 @@ SOURCEFILES = \
 	GuiClipboard.cpp \
 	GuiCommandBuffer.cpp \
 	GuiCommandEdit.cpp \
+	GuiCompare.cpp \
 	GuiCompleter.cpp \
 	GuiDelimiter.cpp \
 	GuiDialog.cpp \
@@ -107,6 +108,8 @@ SOURCEFILES = \
 	GuiPrint.cpp \
 	GuiPrintindex.cpp \
 	GuiPrintNomencl.cpp \
+	GuiProgress.cpp \
+	GuiProgressView.cpp \
 	GuiRef.cpp \
 	GuiSearch.cpp \
 	GuiSelection.cpp \
@@ -132,6 +135,7 @@ SOURCEFILES = \
 	LengthCombo.cpp \
 	LyXFileDialog.cpp \
 	LaTeXHighlighter.cpp \
+	LayoutBox.cpp \
 	Menus.cpp \
 	PanelStack.cpp \
 	qt_helpers.cpp \
@@ -178,6 +182,7 @@ MOCHEADER = \
 	GuiClipboard.h \
 	GuiCommandBuffer.h \
 	GuiCommandEdit.h \
+	GuiCompare.h \
 	GuiCompleter.h \
 	GuiDelimiter.h \
 	GuiDialog.h \
@@ -205,6 +210,8 @@ MOCHEADER = \
 	GuiPrint.h \
 	GuiPrintindex.h \
 	GuiPrintNomencl.h \
+	GuiProgress.h \
+	GuiProgressView.h \
 	GuiRef.h \
 	GuiSearch.h \
 	GuiSelection.h \
@@ -227,6 +234,7 @@ MOCHEADER = \
 	GuiWrap.h \
 	IconPalette.h \
 	InsertTableWidget.h \
+	LayoutBox.h \
 	LengthCombo.h \
 	LyXFileDialog.h \
 	Menus.h \
@@ -237,18 +245,19 @@ MOCHEADER = \
 
 UIFILES = \
 	AboutUi.ui \
-	AskForTextUi.ui \
 	BibitemUi.ui \
 	BiblioUi.ui \
 	BibtexAddUi.ui \
 	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,8 +278,10 @@ UIFILES = \
 	LanguageUi.ui \
 	LaTeXUi.ui \
 	ListingsUi.ui \
+	ListingsSettingsUi.ui \
 	LogUi.ui \
 	MarginsUi.ui \
+	MasterChildUi.ui \
 	MathMatrixUi.ui \
 	MathsUi.ui \
 	ModulesUi.ui \
@@ -305,6 +316,7 @@ UIFILES = \
 	PrintUi.ui \
 	PrintindexUi.ui \
 	PrintNomenclUi.ui \
+	ProgressViewUi.ui \
 	RefUi.ui \
 	SearchUi.ui \
 	SendtoUi.ui \