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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 4c8f2c2f22..a1fbf59e02 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -11,31 +11,29 @@ 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  #############################
 
-noinst_LTLIBRARIES = liblyxqt4.la
+noinst_LIBRARIES = liblyxqt4.a
 
-liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
-liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-liblyxqt4_la_LIBADD = $(QT4_LIB) 
+liblyxqt4_a_DEPENDENCIES = $(MOCEDFILES)
 
 AM_CPPFLAGS += \
 	$(QT4_CPPFLAGS) \
@@ -59,6 +57,7 @@ SOURCEFILES = \
 	CustomizedWidgets.cpp \
 	EmptyTable.cpp \
 	FileDialog.cpp \
+	FindAndReplace.cpp \
 	FloatPlacement.cpp \
 	GuiAbout.cpp \
 	GuiAlert.cpp \
@@ -74,6 +73,7 @@ SOURCEFILES = \
 	GuiClipboard.cpp \
 	GuiCommandBuffer.cpp \
 	GuiCommandEdit.cpp \
+	GuiCompare.cpp \
 	GuiCompleter.cpp \
 	GuiDelimiter.cpp \
 	GuiDialog.cpp \
@@ -91,6 +91,8 @@ SOURCEFILES = \
 	GuiIdListModel.cpp \
 	GuiImage.cpp \
 	GuiInclude.cpp \
+	GuiIndex.cpp \
+	GuiIndices.cpp \
 	GuiInfo.cpp \
 	GuiKeySymbol.cpp \
 	GuiLabel.cpp \
@@ -101,8 +103,13 @@ SOURCEFILES = \
 	GuiNote.cpp \
 	GuiPainter.cpp \
 	GuiParagraph.cpp \
+	GuiPhantom.cpp \
 	GuiPrefs.cpp \
 	GuiPrint.cpp \
+	GuiPrintindex.cpp \
+	GuiPrintNomencl.cpp \
+	GuiProgress.cpp \
+	GuiProgressView.cpp \
 	GuiRef.cpp \
 	GuiSearch.cpp \
 	GuiSelection.cpp \
@@ -128,6 +135,7 @@ SOURCEFILES = \
 	LengthCombo.cpp \
 	LyXFileDialog.cpp \
 	LaTeXHighlighter.cpp \
+	LayoutBox.cpp \
 	Menus.cpp \
 	PanelStack.cpp \
 	qt_helpers.cpp \
@@ -159,6 +167,7 @@ MOCHEADER = \
 	BulletsModule.h \
 	CustomizedWidgets.h \
 	EmptyTable.h \
+	FindAndReplace.h \
 	FloatPlacement.h \
 	GuiAbout.h \
 	GuiApplication.h \
@@ -173,6 +182,7 @@ MOCHEADER = \
 	GuiClipboard.h \
 	GuiCommandBuffer.h \
 	GuiCommandEdit.h \
+	GuiCompare.h \
 	GuiCompleter.h \
 	GuiDelimiter.h \
 	GuiDialog.h \
@@ -185,6 +195,8 @@ MOCHEADER = \
 	GuiHSpace.h \
 	GuiHyperlink.h \
 	GuiInclude.h \
+	GuiIndex.h \
+	GuiIndices.h \
 	GuiInfo.h \
 	GuiLabel.h \
 	GuiListings.h \
@@ -193,8 +205,13 @@ MOCHEADER = \
 	GuiNomencl.h \
 	GuiNote.h \
 	GuiParagraph.h \
+	GuiPhantom.h \
 	GuiPrefs.h \
 	GuiPrint.h \
+	GuiPrintindex.h \
+	GuiPrintNomencl.h \
+	GuiProgress.h \
+	GuiProgressView.h \
 	GuiRef.h \
 	GuiSearch.h \
 	GuiSelection.h \
@@ -217,6 +234,7 @@ MOCHEADER = \
 	GuiWrap.h \
 	IconPalette.h \
 	InsertTableWidget.h \
+	LayoutBox.h \
 	LengthCombo.h \
 	LyXFileDialog.h \
 	Menus.h \
@@ -227,23 +245,25 @@ 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 \
 	ERTUi.ui \
 	ExternalUi.ui \
+	FindAndReplaceUi.ui \
 	FloatPlacementUi.ui \
 	FloatUi.ui \
 	FontUi.ui \
@@ -251,22 +271,28 @@ UIFILES = \
 	HSpaceUi.ui \
 	HyperlinkUi.ui \
 	IncludeUi.ui \
+	IndexUi.ui \
+	IndicesUi.ui \
 	InfoUi.ui \
 	LabelUi.ui \
 	LanguageUi.ui \
 	LaTeXUi.ui \
 	ListingsUi.ui \
+	ListingsSettingsUi.ui \
 	LogUi.ui \
 	MarginsUi.ui \
+	MasterChildUi.ui \
 	MathMatrixUi.ui \
 	MathsUi.ui \
 	ModulesUi.ui \
 	NomenclUi.ui \
 	NoteUi.ui \
 	NumberingUi.ui \
+	OutputUi.ui \
 	PageLayoutUi.ui \
 	ParagraphUi.ui \
 	PDFSupportUi.ui \
+	PhantomUi.ui \
 	PreambleUi.ui \
 	PrefColorsUi.ui \
 	PrefCompletionUi.ui \
@@ -288,6 +314,9 @@ UIFILES = \
 	PrefsUi.ui \
 	PrefUi.ui \
 	PrintUi.ui \
+	PrintindexUi.ui \
+	PrintNomenclUi.ui \
+	ProgressViewUi.ui \
 	RefUi.ui \
 	SearchUi.ui \
 	SendtoUi.ui \
@@ -301,6 +330,7 @@ UIFILES = \
 	TextLayoutUi.ui \
 	ThesaurusUi.ui \
 	TocUi.ui \
+	ToggleWarningUi.ui \
 	ViewSourceUi.ui \
 	VSpaceUi.ui \
 	WrapUi.ui
@@ -311,7 +341,7 @@ liblyxqt4.cpp:
 
 if MONOLITHIC_FRONTEND_QT4
 
-liblyxqt4_la_SOURCES = \
+liblyxqt4_a_SOURCES = \
 	liblyxqt4.cpp \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
@@ -321,7 +351,7 @@ CLEANFILES += liblyxqt4.cpp
 
 else
 
-liblyxqt4_la_SOURCES = \
+liblyxqt4_a_SOURCES = \
 	$(SOURCEFILES) \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)