Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index ade4dc01a36c5b1529d8c146642b7efae7a998ee..eba02e902a354ea51921cdb940a9b0d467b0ef7e 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -1,12 +1,11 @@
 include $(top_srcdir)/config/common.am
 
-CLEANFILES += $(UIFILES:%.ui=ui_%.h)
-CLEANFILES += $(MOCEDFILES)
-
 BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h)
 BUILT_SOURCES += $(MOCEDFILES)
 BUILT_SOURCES += Resources.cpp Resources.qrc
 
+CLEANFILES += $(BUILT_SOURCES)
+
 #########################  Qt stuff  #############################
 # Use _() for localization instead of tr() or trUtf8()
 UIC4FLAGS=-tr lyx::qt_
@@ -46,24 +45,21 @@ AM_CPPFLAGS += \
        $(QT4_INCLUDES) $(BOOST_INCLUDES)
 
 SOURCEFILES = \
-       ../ButtonPolicy.cpp \
-       ../ButtonPolicy.h \
-       ../Dialog.cpp \
-       ../Dialog.h \
-       ../frontend_helpers.cpp \
-       ../frontend_helpers.h \
+       ButtonPolicy.cpp \
+       ButtonPolicy.h \
+       Dialog.cpp \
+       Dialog.h \
        Resources.cpp \
        Action.cpp \
-       alert_pimpl.cpp \
        BulletsModule.cpp \
        ButtonController.cpp \
        ColorCache.cpp \
        CustomizedWidgets.cpp \
-       Dialogs.cpp \
        EmptyTable.cpp \
        FileDialog.cpp \
        FloatPlacement.cpp \
        GuiAbout.cpp \
+       GuiAlert.cpp \
        GuiApplication.cpp \
        GuiBibitem.cpp \
        GuiBibtex.cpp \
@@ -76,6 +72,7 @@ SOURCEFILES = \
        GuiClipboard.cpp \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
+       GuiCompleter.cpp \
        GuiDelimiter.cpp \
        GuiDialog.cpp \
        GuiDocument.cpp \
@@ -87,22 +84,21 @@ SOURCEFILES = \
        GuiFontLoader.cpp \
        GuiFontMetrics.cpp \
        GuiGraphics.cpp \
+       GuiHSpace.cpp \
        GuiHyperlink.cpp \
+       GuiIdListModel.cpp \
        GuiImage.cpp \
-       GuiImplementation.cpp \
        GuiInclude.cpp \
-       GuiIndex.cpp \
        GuiKeySymbol.cpp \
+       GuiLabel.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
        GuiMath.cpp \
        GuiMathMatrix.cpp \
-       GuiMenubar.cpp \
        GuiNomencl.cpp \
        GuiNote.cpp \
        GuiPainter.cpp \
        GuiParagraph.cpp \
-       GuiPopupMenu.cpp \
        GuiPrefs.cpp \
        GuiPrint.cpp \
        GuiRef.cpp \
@@ -113,6 +109,7 @@ SOURCEFILES = \
        GuiSetBorder.cpp \
        GuiShowFile.cpp \
        GuiSpellchecker.cpp \
+       GuiSymbols.cpp \
        GuiTabular.cpp \
        GuiTabularCreate.cpp \
        GuiTexinfo.cpp \
@@ -130,6 +127,7 @@ SOURCEFILES = \
        LengthCombo.cpp \
        LyXFileDialog.cpp \
        LaTeXHighlighter.cpp \
+       Menus.cpp \
        PanelStack.cpp \
        qt_helpers.cpp \
        TocModel.cpp \
@@ -138,21 +136,26 @@ SOURCEFILES = \
 
 NOMOCHEADER = \
        ButtonController.h \
+       ColorCache.h \
        DialogView.h \
+       DockView.h \
+       FileDialog.h \
+       GuiFontExample.h \
        GuiFontLoader.h \
        GuiFontMetrics.h \
+       GuiIdListModel.h \
        GuiImage.h \
+       GuiKeySymbol.h \
        GuiMath.h \
        GuiPainter.h \
        GuiToolbars.h \
+       LaTeXHighlighter.h \
        qt_helpers.h
 
 MOCHEADER = \
        Action.h \
        BulletsModule.h \
-       ColorCache.h \
        CustomizedWidgets.h \
-       DockView.h \
        EmptyTable.h \
        FloatPlacement.h \
        GuiAbout.h \
@@ -168,6 +171,7 @@ MOCHEADER = \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
+       GuiCompleter.h \
        GuiDelimiter.h \
        GuiDialog.h \
        GuiDocument.h \
@@ -175,21 +179,17 @@ MOCHEADER = \
        GuiERT.h \
        GuiExternal.h \
        GuiFloat.h \
-       GuiFontExample.h \
        GuiGraphics.h \
+       GuiHSpace.h \
        GuiHyperlink.h \
-       GuiImplementation.h \
        GuiInclude.h \
-       GuiIndex.h \
-       GuiKeySymbol.h \
+       GuiLabel.h \
        GuiListings.h \
        GuiLog.h \
        GuiMathMatrix.h \
-       GuiMenubar.h \
        GuiNomencl.h \
        GuiNote.h \
        GuiParagraph.h \
-       GuiPopupMenu.h \
        GuiPrefs.h \
        GuiPrint.h \
        GuiRef.h \
@@ -200,6 +200,7 @@ MOCHEADER = \
        GuiSetBorder.h \
        GuiShowFile.h \
        GuiSpellchecker.h \
+       GuiSymbols.h \
        GuiTabularCreate.h \
        GuiTabular.h \
        GuiTexinfo.h \
@@ -215,9 +216,8 @@ MOCHEADER = \
        InsertTableWidget.h \
        LengthCombo.h \
        LyXFileDialog.h \
-       LaTeXHighlighter.h \
+       Menus.h \
        PanelStack.h \
-       qlkey.h \
        TocModel.h \
        TocWidget.h \
        Validator.h
@@ -241,14 +241,14 @@ UIFILES = \
        ErrorListUi.ui \
        ERTUi.ui \
        ExternalUi.ui \
-       EmbeddedFilesUi.ui \
        FloatPlacementUi.ui \
        FloatUi.ui \
        FontUi.ui \
        GraphicsUi.ui \
+       HSpaceUi.ui \
        HyperlinkUi.ui \
        IncludeUi.ui \
-       IndexUi.ui \
+       LabelUi.ui \
        LanguageUi.ui \
        LaTeXUi.ui \
        ListingsUi.ui \
@@ -264,12 +264,14 @@ UIFILES = \
        PDFSupportUi.ui \
        PreambleUi.ui \
        PrefColorsUi.ui \
+       PrefCompletionUi.ui \
        PrefConvertersUi.ui \
        PrefDateUi.ui \
        PrefDisplayUi.ui \
+       PrefEditUi.ui \
        PrefFileformatsUi.ui \
        PrefIdentityUi.ui \
-       PrefKeyboardUi.ui \
+       PrefInputUi.ui \
        PrefLanguageUi.ui \
        PrefLatexUi.ui \
        PrefPathsUi.ui \
@@ -287,6 +289,7 @@ UIFILES = \
        ShortcutUi.ui \
        ShowFileUi.ui \
        SpellcheckerUi.ui \
+       SymbolsUi.ui \
        TabularCreateUi.ui \
        TabularUi.ui \
        TexinfoUi.ui \
@@ -310,6 +313,7 @@ liblyxqt4_la_SOURCES = \
        $(NOMOCHEADER)
 
 BUILT_SOURCES += liblyxqt4.cpp
+CLEANFILES += liblyxqt4.cpp
 
 else
 
@@ -321,7 +325,7 @@ liblyxqt4_la_SOURCES = \
        $(MOCHEADER) \
        $(NOMOCHEADER)
 
-EXTRA_DIST = pch.h
+EXTRA_DIST = pch.h ui/compile_uic.sh $(UIFILES:%=ui/%)
 BUILT_SOURCES += $(PCH_FILE)
 AM_CPPFLAGS += $(PCH_FLAGS)