UNDO: enc

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 13391190fdfdc4927a70d04498f5c310c50f3bfb..ba4a3056e0bd52dfb5fdfafa2376e3c96eecf2f5 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 \
@@ -80,7 +81,6 @@ SOURCEFILES = \
        GuiErrorList.cpp \
        GuiERT.cpp \
        GuiExternal.cpp \
-       GuiFloat.cpp \
        GuiFontExample.cpp \
        GuiFontLoader.cpp \
        GuiFontMetrics.cpp \
@@ -90,6 +90,8 @@ SOURCEFILES = \
        GuiIdListModel.cpp \
        GuiImage.cpp \
        GuiInclude.cpp \
+       GuiIndex.cpp \
+       GuiIndices.cpp \
        GuiInfo.cpp \
        GuiKeySymbol.cpp \
        GuiLabel.cpp \
@@ -103,6 +105,10 @@ SOURCEFILES = \
        GuiPhantom.cpp \
        GuiPrefs.cpp \
        GuiPrint.cpp \
+       GuiPrintindex.cpp \
+       GuiPrintNomencl.cpp \
+       GuiProgress.cpp \
+       GuiProgressView.cpp \
        GuiRef.cpp \
        GuiSearch.cpp \
        GuiSelection.cpp \
@@ -125,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 \
@@ -174,6 +183,7 @@ MOCHEADER = \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
+       GuiCompare.h \
        GuiCompleter.h \
        GuiDelimiter.h \
        GuiDialog.h \
@@ -181,11 +191,12 @@ MOCHEADER = \
        GuiErrorList.h \
        GuiERT.h \
        GuiExternal.h \
-       GuiFloat.h \
        GuiGraphics.h \
        GuiHSpace.h \
        GuiHyperlink.h \
        GuiInclude.h \
+       GuiIndex.h \
+       GuiIndices.h \
        GuiInfo.h \
        GuiLabel.h \
        GuiListings.h \
@@ -197,6 +208,10 @@ MOCHEADER = \
        GuiPhantom.h \
        GuiPrefs.h \
        GuiPrint.h \
+       GuiPrintindex.h \
+       GuiPrintNomencl.h \
+       GuiProgress.h \
+       GuiProgressView.h \
        GuiRef.h \
        GuiSearch.h \
        GuiSelection.h \
@@ -219,6 +234,9 @@ MOCHEADER = \
        GuiWrap.h \
        IconPalette.h \
        InsertTableWidget.h \
+       InsetParamsDialog.h \
+       InsetParamsWidget.h \
+       LayoutBox.h \
        LengthCombo.h \
        LyXFileDialog.h \
        Menus.h \
@@ -229,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 \
@@ -248,25 +268,30 @@ UIFILES = \
        ExternalUi.ui \
        FindAndReplaceUi.ui \
        FloatPlacementUi.ui \
-       FloatUi.ui \
        FontUi.ui \
        GraphicsUi.ui \
        HSpaceUi.ui \
        HyperlinkUi.ui \
        IncludeUi.ui \
+       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 \
        NomenclUi.ui \
        NoteUi.ui \
        NumberingUi.ui \
+       OutputUi.ui \
        PageLayoutUi.ui \
        ParagraphUi.ui \
        PDFSupportUi.ui \
@@ -275,7 +300,7 @@ UIFILES = \
        PrefColorsUi.ui \
        PrefCompletionUi.ui \
        PrefConvertersUi.ui \
-       PrefDateUi.ui \
+       PrefOutputUi.ui \
        PrefDisplayUi.ui \
        PrefEditUi.ui \
        PrefFileformatsUi.ui \
@@ -284,7 +309,6 @@ UIFILES = \
        PrefLanguageUi.ui \
        PrefLatexUi.ui \
        PrefPathsUi.ui \
-       PrefPlaintextUi.ui \
        PrefPrinterUi.ui \
        PrefScreenFontsUi.ui \
        PrefShortcutsUi.ui \
@@ -292,6 +316,9 @@ UIFILES = \
        PrefsUi.ui \
        PrefUi.ui \
        PrintUi.ui \
+       PrintindexUi.ui \
+       PrintNomenclUi.ui \
+       ProgressViewUi.ui \
        RefUi.ui \
        SearchUi.ui \
        SendtoUi.ui \
@@ -305,6 +332,7 @@ UIFILES = \
        TextLayoutUi.ui \
        ThesaurusUi.ui \
        TocUi.ui \
+       ToggleWarningUi.ui \
        ViewSourceUi.ui \
        VSpaceUi.ui \
        WrapUi.ui
@@ -330,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)