X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMakefile.am;h=ba4a3056e0bd52dfb5fdfafa2376e3c96eecf2f5;hb=c09d33120d05af8c237032147a787b214c1f3375;hp=3a50203a06fc5092fc918166f461365b1327d519;hpb=de22184d972f501233b66f815f64350c39bc5dd5;p=features.git

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 3a50203a06..ba4a3056e0 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 \
@@ -80,7 +81,6 @@ SOURCEFILES = \
 	GuiErrorList.cpp \
 	GuiERT.cpp \
 	GuiExternal.cpp \
-	GuiFloat.cpp \
 	GuiFontExample.cpp \
 	GuiFontLoader.cpp \
 	GuiFontMetrics.cpp \
@@ -105,6 +105,10 @@ SOURCEFILES = \
 	GuiPhantom.cpp \
 	GuiPrefs.cpp \
 	GuiPrint.cpp \
+	GuiPrintindex.cpp \
+	GuiPrintNomencl.cpp \
+	GuiProgress.cpp \
+	GuiProgressView.cpp \
 	GuiRef.cpp \
 	GuiSearch.cpp \
 	GuiSelection.cpp \
@@ -127,9 +131,12 @@ SOURCEFILES = \
 	GuiWrap.cpp \
 	IconPalette.cpp \
 	InsertTableWidget.cpp \
+	InsetParamsDialog.cpp \
+	InsetParamsWidget.cpp \
 	LengthCombo.cpp \
 	LyXFileDialog.cpp \
 	LaTeXHighlighter.cpp \
+	LayoutBox.cpp \
 	Menus.cpp \
 	PanelStack.cpp \
 	qt_helpers.cpp \
@@ -176,6 +183,7 @@ MOCHEADER = \
 	GuiClipboard.h \
 	GuiCommandBuffer.h \
 	GuiCommandEdit.h \
+	GuiCompare.h \
 	GuiCompleter.h \
 	GuiDelimiter.h \
 	GuiDialog.h \
@@ -183,7 +191,6 @@ MOCHEADER = \
 	GuiErrorList.h \
 	GuiERT.h \
 	GuiExternal.h \
-	GuiFloat.h \
 	GuiGraphics.h \
 	GuiHSpace.h \
 	GuiHyperlink.h \
@@ -201,6 +208,10 @@ MOCHEADER = \
 	GuiPhantom.h \
 	GuiPrefs.h \
 	GuiPrint.h \
+	GuiPrintindex.h \
+	GuiPrintNomencl.h \
+	GuiProgress.h \
+	GuiProgressView.h \
 	GuiRef.h \
 	GuiSearch.h \
 	GuiSelection.h \
@@ -223,6 +234,9 @@ MOCHEADER = \
 	GuiWrap.h \
 	IconPalette.h \
 	InsertTableWidget.h \
+	InsetParamsDialog.h \
+	InsetParamsWidget.h \
+	LayoutBox.h \
 	LengthCombo.h \
 	LyXFileDialog.h \
 	Menus.h \
@@ -233,18 +247,20 @@ 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 \
+	ColorUi.ui \
+	CompareUi.ui \
 	DelimiterUi.ui \
 	DocumentUi.ui \
 	ErrorListUi.ui \
@@ -252,7 +268,6 @@ UIFILES = \
 	ExternalUi.ui \
 	FindAndReplaceUi.ui \
 	FloatPlacementUi.ui \
-	FloatUi.ui \
 	FontUi.ui \
 	GraphicsUi.ui \
 	HSpaceUi.ui \
@@ -261,12 +276,15 @@ UIFILES = \
 	IndexUi.ui \
 	IndicesUi.ui \
 	InfoUi.ui \
+	InsetParamsUi.ui \
 	LabelUi.ui \
 	LanguageUi.ui \
 	LaTeXUi.ui \
 	ListingsUi.ui \
+	ListingsSettingsUi.ui \
 	LogUi.ui \
 	MarginsUi.ui \
+	MasterChildUi.ui \
 	MathMatrixUi.ui \
 	MathsUi.ui \
 	ModulesUi.ui \
@@ -282,7 +300,7 @@ UIFILES = \
 	PrefColorsUi.ui \
 	PrefCompletionUi.ui \
 	PrefConvertersUi.ui \
-	PrefDateUi.ui \
+	PrefOutputUi.ui \
 	PrefDisplayUi.ui \
 	PrefEditUi.ui \
 	PrefFileformatsUi.ui \
@@ -291,7 +309,6 @@ UIFILES = \
 	PrefLanguageUi.ui \
 	PrefLatexUi.ui \
 	PrefPathsUi.ui \
-	PrefPlaintextUi.ui \
 	PrefPrinterUi.ui \
 	PrefScreenFontsUi.ui \
 	PrefShortcutsUi.ui \
@@ -299,6 +316,9 @@ UIFILES = \
 	PrefsUi.ui \
 	PrefUi.ui \
 	PrintUi.ui \
+	PrintindexUi.ui \
+	PrintNomenclUi.ui \
+	ProgressViewUi.ui \
 	RefUi.ui \
 	SearchUi.ui \
 	SendtoUi.ui \
@@ -312,6 +332,7 @@ UIFILES = \
 	TextLayoutUi.ui \
 	ThesaurusUi.ui \
 	TocUi.ui \
+	ToggleWarningUi.ui \
 	ViewSourceUi.ui \
 	VSpaceUi.ui \
 	WrapUi.ui
@@ -337,7 +358,7 @@ liblyxqt4_a_SOURCES = \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
 
-EXTRA_DIST = pch.h ui/compile_uic.sh $(UIFILES:%=ui/%)
+EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
 BUILT_SOURCES += $(PCH_FILE)
 AM_CPPFLAGS += $(PCH_FLAGS)