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 998d2eea1c3042608a73ee34e7fb815734063205..eba02e902a354ea51921cdb940a9b0d467b0ef7e 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -1,12 +1,12 @@
 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)
 
-#########################  Translation  #############################
+#########################  Qt stuff  #############################
 # Use _() for localization instead of tr() or trUtf8()
 UIC4FLAGS=-tr lyx::qt_
 
@@ -18,9 +18,20 @@ MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
 %_moc.cpp: %.h
        $(MOC4) -o $@ $<
 
+Resources.qrc: Makefile
+       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 $@
+
+
 #########################  LIBRARIES  #############################
 
-pkglib_LTLIBRARIES = liblyxqt4.la
+noinst_LTLIBRARIES = liblyxqt4.la
 
 liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
 liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
@@ -31,20 +42,24 @@ AM_CPPFLAGS += \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/images \
-       $(QT4_INCLUDES) $(BOOST_INCLUDES) \
-       -I$(top_srcdir)/src/frontends/controllers
+       $(QT4_INCLUDES) $(BOOST_INCLUDES)
 
 SOURCEFILES = \
+       ButtonPolicy.cpp \
+       ButtonPolicy.h \
+       Dialog.cpp \
+       Dialog.h \
+       Resources.cpp \
        Action.cpp \
-       alert_pimpl.cpp \
        BulletsModule.cpp \
-       CheckedLineEdit.cpp \
+       ButtonController.cpp \
        ColorCache.cpp \
-       Dialogs.cpp \
+       CustomizedWidgets.cpp \
        EmptyTable.cpp \
        FileDialog.cpp \
        FloatPlacement.cpp \
        GuiAbout.cpp \
+       GuiAlert.cpp \
        GuiApplication.cpp \
        GuiBibitem.cpp \
        GuiBibtex.cpp \
@@ -54,42 +69,38 @@ SOURCEFILES = \
        GuiChanges.cpp \
        GuiCharacter.cpp \
        GuiCitation.cpp \
-       GuiCitationDialog.cpp \
        GuiClipboard.cpp \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
-       GuiDelimiterDialog.cpp \
-       GuiDialogView.cpp \
+       GuiCompleter.cpp \
+       GuiDelimiter.cpp \
+       GuiDialog.cpp \
        GuiDocument.cpp \
-       GuiEmbeddedFiles.cpp \
        GuiErrorList.cpp \
        GuiERT.cpp \
        GuiExternal.cpp \
        GuiFloat.cpp \
-       GuiFloatDialog.cpp \
        GuiFontExample.cpp \
        GuiFontLoader.cpp \
        GuiFontMetrics.cpp \
        GuiGraphics.cpp \
-       GuiGraphicsDialog.cpp \
+       GuiHSpace.cpp \
+       GuiHyperlink.cpp \
+       GuiIdListModel.cpp \
        GuiImage.cpp \
-       GuiImplementation.cpp \
        GuiInclude.cpp \
-       GuiIndex.cpp \
-       GuiKeySymbol.cpp \
        GuiKeySymbol.cpp \
+       GuiLabel.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
-       GuiMathMatrixDialog.cpp \
-       GuiMenubar.cpp \
+       GuiMath.cpp \
+       GuiMathMatrix.cpp \
        GuiNomencl.cpp \
        GuiNote.cpp \
        GuiPainter.cpp \
        GuiParagraph.cpp \
-       GuiPopupMenu.cpp \
        GuiPrefs.cpp \
        GuiPrint.cpp \
-       GuiPrintDialog.cpp \
        GuiRef.cpp \
        GuiSearch.cpp \
        GuiSelection.cpp \
@@ -98,13 +109,14 @@ SOURCEFILES = \
        GuiSetBorder.cpp \
        GuiShowFile.cpp \
        GuiSpellchecker.cpp \
+       GuiSymbols.cpp \
        GuiTabular.cpp \
        GuiTabularCreate.cpp \
        GuiTexinfo.cpp \
        GuiThesaurus.cpp \
        GuiToc.cpp \
        GuiToolbar.cpp \
-       GuiURLDialog.cpp \
+       GuiToolbars.cpp \
        GuiView.cpp \
        GuiViewSource.cpp \
        GuiVSpace.cpp \
@@ -114,33 +126,36 @@ SOURCEFILES = \
        InsertTableWidget.cpp \
        LengthCombo.cpp \
        LyXFileDialog.cpp \
+       LaTeXHighlighter.cpp \
+       Menus.cpp \
        PanelStack.cpp \
-       Qt2BC.cpp \
        qt_helpers.cpp \
-       socket_callback.cpp \
        TocModel.cpp \
        TocWidget.cpp \
-       UrlView.cpp \
        Validator.cpp 
 
 NOMOCHEADER = \
-       CheckedLineEdit.h \
-       GuiClipboard.h \
+       ButtonController.h \
+       ColorCache.h \
+       DialogView.h \
+       DockView.h \
+       FileDialog.h \
+       GuiFontExample.h \
        GuiFontLoader.h \
        GuiFontMetrics.h \
-       GuiSelection.h \
-       GuiGraphics.h \
+       GuiIdListModel.h \
        GuiImage.h \
+       GuiKeySymbol.h \
+       GuiMath.h \
        GuiPainter.h \
-       GuiPrint.h \
-       Qt2BC.h \
+       GuiToolbars.h \
+       LaTeXHighlighter.h \
        qt_helpers.h
 
 MOCHEADER = \
        Action.h \
        BulletsModule.h \
-       ColorCache.h \
-       DockView.h \
+       CustomizedWidgets.h \
        EmptyTable.h \
        FloatPlacement.h \
        GuiAbout.h \
@@ -152,49 +167,46 @@ MOCHEADER = \
        GuiBranch.h \
        GuiChanges.h \
        GuiCharacter.h \
-       GuiCitationDialog.h \
        GuiCitation.h \
+       GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
-       GuiDelimiterDialog.h \
-       GuiDialogView.h \
+       GuiCompleter.h \
+       GuiDelimiter.h \
+       GuiDialog.h \
        GuiDocument.h \
-       GuiEmbeddedFiles.h \
        GuiErrorList.h \
        GuiERT.h \
        GuiExternal.h \
-       GuiFloatDialog.h \
        GuiFloat.h \
-       GuiFontExample.h \
-       GuiGraphicsDialog.h \
-       GuiImplementation.h \
+       GuiGraphics.h \
+       GuiHSpace.h \
+       GuiHyperlink.h \
        GuiInclude.h \
-       GuiIndex.h \
-       GuiKeySymbol.h \
+       GuiLabel.h \
        GuiListings.h \
        GuiLog.h \
-       GuiMathMatrixDialog.h \
-       GuiMenubar.h \
+       GuiMathMatrix.h \
        GuiNomencl.h \
        GuiNote.h \
        GuiParagraph.h \
-       GuiPopupMenu.h \
        GuiPrefs.h \
-       GuiPrintDialog.h \
+       GuiPrint.h \
        GuiRef.h \
        GuiSearch.h \
+       GuiSelection.h \
        GuiSelectionManager.h \
        GuiSendto.h \
        GuiSetBorder.h \
        GuiShowFile.h \
        GuiSpellchecker.h \
+       GuiSymbols.h \
        GuiTabularCreate.h \
        GuiTabular.h \
        GuiTexinfo.h \
        GuiThesaurus.h \
        GuiToc.h \
        GuiToolbar.h \
-       GuiURLDialog.h \
        GuiView.h \
        GuiViewSource.h \
        GuiVSpace.h \
@@ -204,9 +216,8 @@ MOCHEADER = \
        InsertTableWidget.h \
        LengthCombo.h \
        LyXFileDialog.h \
+       Menus.h \
        PanelStack.h \
-       qlkey.h \
-       socket_callback.h \
        TocModel.h \
        TocWidget.h \
        Validator.h
@@ -227,7 +238,6 @@ UIFILES = \
        CitationUi.ui \
        DelimiterUi.ui \
        DocumentUi.ui \
-       EmbeddedFilesUi.ui \
        ErrorListUi.ui \
        ERTUi.ui \
        ExternalUi.ui \
@@ -235,8 +245,10 @@ UIFILES = \
        FloatUi.ui \
        FontUi.ui \
        GraphicsUi.ui \
+       HSpaceUi.ui \
+       HyperlinkUi.ui \
        IncludeUi.ui \
-       IndexUi.ui \
+       LabelUi.ui \
        LanguageUi.ui \
        LaTeXUi.ui \
        ListingsUi.ui \
@@ -249,22 +261,24 @@ UIFILES = \
        NumberingUi.ui \
        PageLayoutUi.ui \
        ParagraphUi.ui \
+       PDFSupportUi.ui \
        PreambleUi.ui \
        PrefColorsUi.ui \
+       PrefCompletionUi.ui \
        PrefConvertersUi.ui \
-       PrefCopiersUi.ui \
-       PrefCygwinPathUi.ui \
        PrefDateUi.ui \
        PrefDisplayUi.ui \
+       PrefEditUi.ui \
        PrefFileformatsUi.ui \
        PrefIdentityUi.ui \
-       PrefKeyboardUi.ui \
+       PrefInputUi.ui \
        PrefLanguageUi.ui \
        PrefLatexUi.ui \
        PrefPathsUi.ui \
        PrefPlaintextUi.ui \
        PrefPrinterUi.ui \
        PrefScreenFontsUi.ui \
+       PrefShortcutsUi.ui \
        PrefSpellcheckerUi.ui \
        PrefsUi.ui \
        PrefUi.ui \
@@ -272,15 +286,16 @@ UIFILES = \
        RefUi.ui \
        SearchUi.ui \
        SendtoUi.ui \
+       ShortcutUi.ui \
        ShowFileUi.ui \
        SpellcheckerUi.ui \
+       SymbolsUi.ui \
        TabularCreateUi.ui \
        TabularUi.ui \
        TexinfoUi.ui \
        TextLayoutUi.ui \
        ThesaurusUi.ui \
        TocUi.ui \
-       URLUi.ui \
        ViewSourceUi.ui \
        VSpaceUi.ui \
        WrapUi.ui
@@ -298,6 +313,7 @@ liblyxqt4_la_SOURCES = \
        $(NOMOCHEADER)
 
 BUILT_SOURCES += liblyxqt4.cpp
+CLEANFILES += liblyxqt4.cpp
 
 else
 
@@ -309,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)