X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMakefile.am;h=a1fbf59e02b4d43f2e6e6015d27f6bc52f5f71ef;hb=58505db8192762ee74a30622a3a0a8b6e091c555;hp=6486be4b46eb69ea3e9c8b37ea237c4fc9485aa1;hpb=2e11d3ca916849c669b9a0029a6262140de044ce;p=lyx.git

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 6486be4b46..a1fbf59e02 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -11,34 +11,34 @@ 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)
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-%_moc.cpp: %.h
-	$(MOC4) -o $@ $<
+moc_%.cpp: %.h
+	$(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) \
+	-DQT_NO_CAST_TO_ASCII \
+	-DQT_NO_STL \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/images \
@@ -57,6 +57,7 @@ SOURCEFILES = \
 	CustomizedWidgets.cpp \
 	EmptyTable.cpp \
 	FileDialog.cpp \
+	FindAndReplace.cpp \
 	FloatPlacement.cpp \
 	GuiAbout.cpp \
 	GuiAlert.cpp \
@@ -72,6 +73,7 @@ SOURCEFILES = \
 	GuiClipboard.cpp \
 	GuiCommandBuffer.cpp \
 	GuiCommandEdit.cpp \
+	GuiCompare.cpp \
 	GuiCompleter.cpp \
 	GuiDelimiter.cpp \
 	GuiDialog.cpp \
@@ -89,18 +91,25 @@ SOURCEFILES = \
 	GuiIdListModel.cpp \
 	GuiImage.cpp \
 	GuiInclude.cpp \
+	GuiIndex.cpp \
+	GuiIndices.cpp \
+	GuiInfo.cpp \
 	GuiKeySymbol.cpp \
 	GuiLabel.cpp \
 	GuiListings.cpp \
 	GuiLog.cpp \
-	GuiMath.cpp \
 	GuiMathMatrix.cpp \
 	GuiNomencl.cpp \
 	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 \
@@ -116,7 +125,6 @@ SOURCEFILES = \
 	GuiThesaurus.cpp \
 	GuiToc.cpp \
 	GuiToolbar.cpp \
-	GuiToolbars.cpp \
 	GuiView.cpp \
 	GuiViewSource.cpp \
 	GuiVSpace.cpp \
@@ -127,11 +135,13 @@ SOURCEFILES = \
 	LengthCombo.cpp \
 	LyXFileDialog.cpp \
 	LaTeXHighlighter.cpp \
+	LayoutBox.cpp \
 	Menus.cpp \
 	PanelStack.cpp \
 	qt_helpers.cpp \
 	TocModel.cpp \
 	TocWidget.cpp \
+	Toolbars.cpp \
 	Validator.cpp 
 
 NOMOCHEADER = \
@@ -146,18 +156,18 @@ NOMOCHEADER = \
 	GuiIdListModel.h \
 	GuiImage.h \
 	GuiKeySymbol.h \
-	GuiMath.h \
 	GuiPainter.h \
-	GuiToolbars.h \
 	LaTeXHighlighter.h \
 	qt_i18n.h \
-	qt_helpers.h
+	qt_helpers.h \
+	Toolbars.h
 
 MOCHEADER = \
 	Action.h \
 	BulletsModule.h \
 	CustomizedWidgets.h \
 	EmptyTable.h \
+	FindAndReplace.h \
 	FloatPlacement.h \
 	GuiAbout.h \
 	GuiApplication.h \
@@ -172,6 +182,7 @@ MOCHEADER = \
 	GuiClipboard.h \
 	GuiCommandBuffer.h \
 	GuiCommandEdit.h \
+	GuiCompare.h \
 	GuiCompleter.h \
 	GuiDelimiter.h \
 	GuiDialog.h \
@@ -184,6 +195,9 @@ MOCHEADER = \
 	GuiHSpace.h \
 	GuiHyperlink.h \
 	GuiInclude.h \
+	GuiIndex.h \
+	GuiIndices.h \
+	GuiInfo.h \
 	GuiLabel.h \
 	GuiListings.h \
 	GuiLog.h \
@@ -191,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 \
@@ -215,6 +234,7 @@ MOCHEADER = \
 	GuiWrap.h \
 	IconPalette.h \
 	InsertTableWidget.h \
+	LayoutBox.h \
 	LengthCombo.h \
 	LyXFileDialog.h \
 	Menus.h \
@@ -225,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 \
@@ -249,20 +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 \
@@ -284,6 +314,9 @@ UIFILES = \
 	PrefsUi.ui \
 	PrefUi.ui \
 	PrintUi.ui \
+	PrintindexUi.ui \
+	PrintNomenclUi.ui \
+	ProgressViewUi.ui \
 	RefUi.ui \
 	SearchUi.ui \
 	SendtoUi.ui \
@@ -297,18 +330,18 @@ UIFILES = \
 	TextLayoutUi.ui \
 	ThesaurusUi.ui \
 	TocUi.ui \
+	ToggleWarningUi.ui \
 	ViewSourceUi.ui \
 	VSpaceUi.ui \
 	WrapUi.ui
 
 
-if MONOLITHIC_FRONTEND_QT4
-
-
 liblyxqt4.cpp:
 	@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
 
-liblyxqt4_la_SOURCES = \
+if MONOLITHIC_FRONTEND_QT4
+
+liblyxqt4_a_SOURCES = \
 	liblyxqt4.cpp \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)
@@ -318,10 +351,7 @@ CLEANFILES += liblyxqt4.cpp
 
 else
 
-liblyxqt4.cpp:
-	touch $@
-
-liblyxqt4_la_SOURCES = \
+liblyxqt4_a_SOURCES = \
 	$(SOURCEFILES) \
 	$(MOCHEADER) \
 	$(NOMOCHEADER)