fix linking of qt4 frontend

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19435 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 74a2a09864bc33a5c9c65b2958d7af59ffe8d9af..399992f35cc389c855a66ecb6b3f5079440cbef9 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -1,5 +1,4 @@
 include $(top_srcdir)/config/common.am
-include $(srcdir)/Makefile.dialogs
 
 CLEANFILES += *.h
 CLEANFILES += *_moc.cpp
@@ -10,7 +9,6 @@ BUILT_SOURCES += $(PCH_FILE)
 BUILT_SOURCES += $(MOCEDFILES)
 
 EXTRA_DIST = pch.h
-EXTRA_DIST += Makefile.dialogs
 
 #########################  Translation  #############################
 # Use _() for localization instead of tr() or trUtf8()
@@ -43,35 +41,245 @@ AM_CPPFLAGS += \
        -I$(top_srcdir)/src/frontends/controllers
 
 liblyxqt4_la_SOURCES = \
+       Action.cpp Action.h \
        alert_pimpl.cpp \
-       ColorCache.h ColorCache.cpp \
-       DockView.h \
+       BulletsModule.cpp \
+       BulletsModule.h \
+       CheckedLineEdit.cpp \
+       CheckedLineEdit.h \
+       ColorCache.cpp \
+       ColorCache.h \
        Dialogs.cpp \
+       DockView.h \
+       EmptyTable.cpp \
+       EmptyTable.h \
        FileDialog.cpp \
-       GuiClipboard.h GuiClipboard.cpp \
-       GuiFontLoader.h GuiFontLoader.cpp \
-       GuiFontMetrics.h GuiFontMetrics.cpp \
-       GuiSelection.h GuiSelection.cpp \
+       FloatPlacement.cpp \
+       FloatPlacement.h \
+       GuiApplication.cpp \
+       GuiApplication.h \
+       GuiClipboard.cpp \
+       GuiClipboard.h \
+       GuiFontLoader.cpp \
+       GuiFontLoader.h \
+       GuiFontMetrics.cpp \
+       GuiFontMetrics.h \
+       GuiImplementation.cpp \
+       GuiImplementation.h \
+       GuiSelection.cpp \
+       GuiSelection.h \
+       GuiView.cpp \
+       GuiView.h \
+       GuiWorkArea.cpp \
+       GuiWorkArea.h \
+       IconPalette.cpp \
+       IconPalette.h \
+       InsertTableWidget.cpp \
+       InsertTableWidget.h \
        KeySymbol.cpp \
-       QLMenubar.cpp QLMenubar.h \
-       QBox.cpp QBox.h \
-       QBranches.cpp QBranches.h \
-       QCitation.cpp QCitation.h \
-       QDialogView.cpp QDialogView.h \
-       QFloat.cpp QFloat.h \
-       QGraphics.cpp QGraphics.h \
-       QListings.cpp QListings.h \
-       QLImage.cpp QLImage.h \
-       QViewSource.cpp QViewSource.h \
-       QLPainter.cpp QLPainter.h \
-       QKeySymbol.cpp QKeySymbol.h \
-       QPrint.cpp QPrint.h \
-       Qt2BC.cpp       Qt2BC.h \
-       CheckedLineEdit.cpp CheckedLineEdit.h \
-       PanelStack.h PanelStack.cpp \
-       QFontExample.h QFontExample.cpp \
+       LengthCombo.cpp \
+       LengthCombo.h \
+       LyXFileDialog.cpp \
+       LyXFileDialog.h \
+       PanelStack.cpp \
+       PanelStack.h \
+       QAbout.cpp \
+       QAbout.h \
+       QBibitem.cpp \
+       QBibitem.h \
+       QBibtex.cpp \
+       QBibtex.h \
+       QBox.cpp \
+       QBox.h \
+       QBranch.cpp \
+       QBranches.cpp \
+       QBranches.h \
+       QBranch.h \
+       QChanges.cpp \
+       QChanges.h \
+       QCharacter.cpp \
+       QCharacter.h \
+       QCitation.cpp \
+       QCitationDialog.cpp \
+       QCitationDialog.h \
+       QCitation.h \
+       QCommandBuffer.cpp \
+       QCommandBuffer.h \
+       QCommandEdit.cpp \
+       QCommandEdit.h \
+       QDelimiterDialog.cpp \
+       QDelimiterDialog.h \
+       QDialogView.cpp \
+       QDialogView.h \
+       QDocument.cpp \
+       QDocument.h \
+       QErrorList.cpp \
+       QErrorList.h \
+       QERT.cpp \
+       QERT.h \
+       QExternal.cpp \
+       QExternal.h \
+       QFloat.cpp \
+       QFloatDialog.cpp \
+       QFloatDialog.h \
+       QFloat.h \
+       QFontExample.cpp \
+       QFontExample.h \
+       QGraphics.cpp \
+       QGraphicsDialog.cpp \
+       QGraphicsDialog.h \
+       QGraphics.h \
+       QInclude.cpp \
+       QInclude.h \
+       QIndex.cpp \
+       QIndex.h \
+       QKeySymbol.cpp \
+       QKeySymbol.h \
+       QLImage.cpp \
+       QLImage.h \
+       QListings.cpp \
+       QListings.h \
        qlkey.h \
-       qt_helpers.h qt_helpers.cpp \
-       qtTimeout.cpp qtTimeout.h \
-       UrlView.cpp UrlView.h \
-       $(MOCFILES)
+       QLMenubar.cpp \
+       QLMenubar.h \
+       QLog.cpp \
+       QLog.h \
+       QLPainter.cpp \
+       QLPainter.h \
+       QLPopupMenu.cpp \
+       QLPopupMenu.h \
+       QLPrintDialog.cpp \
+       QLPrintDialog.h \
+       QLToolbar.cpp \
+       QLToolbar.h \
+       QMathMatrixDialog.cpp \
+       QMathMatrixDialog.h \
+       QNomencl.cpp \
+       QNomencl.h \
+       QNote.cpp \
+       QNote.h \
+       QParagraph.cpp \
+       QParagraph.h \
+       QPrefs.cpp \
+       QPrefs.h \
+       QPrint.cpp \
+       QPrint.h \
+       QRef.cpp \
+       QRef.h \
+       QSearch.cpp \
+       QSearch.h \
+       QSendto.cpp \
+       QSendto.h \
+       QSetBorder.cpp \
+       QSetBorder.h \
+       QShowFile.cpp \
+       QShowFile.h \
+       QSpellchecker.cpp \
+       QSpellchecker.h \
+       Qt2BC.cppQt2BC.h\ \
+       QTabular.cpp \
+       QTabularCreate.cpp \
+       QTabularCreate.h \
+       QTabular.h \
+       QTexinfo.cpp \
+       QTexinfo.h \
+       qt_helpers.cpp \
+       qt_helpers.h \
+       QThesaurus.cpp \
+       QThesaurus.h \
+       QToc.cpp \
+       QToc.h \
+       qtTimeout.cpp \
+       qtTimeout.h \
+       QURLDialog.cpp \
+       QURLDialog.h \
+       QViewSource.cpp \
+       QViewSource.h \
+       QVSpace.cpp \
+       QVSpace.h \
+       QWrap.cpp \
+       QWrap.h \
+       socket_callback.cpp \
+       socket_callback.h \
+       TocModel.cpp \
+       TocModel.h \
+       TocWidget.cpp \
+       TocWidget.h \
+       UrlView.cpp \
+       UrlView.h \
+       Validator.cpp \
+       Validator.h
+
+UIFILES = \
+       AboutUi.ui \
+       AskForTextUi.ui \
+       BibitemUi.ui \
+       BiblioUi.ui \
+       BibtexAddUi.ui \
+       BibtexUi.ui \
+       BoxUi.ui \
+       BranchesUi.ui \
+       BranchUi.ui \
+       BulletsUi.ui \
+       ChangesUi.ui \
+       CharacterUi.ui \
+       CitationUi.ui \
+       DelimiterUi.ui \
+       DocumentUi.ui \
+       ErrorListUi.ui \
+       ERTUi.ui \
+       ExternalUi.ui \
+       FloatPlacementUi.ui \
+       FloatUi.ui \
+       FontUi.ui \
+       GraphicsUi.ui \
+       IncludeUi.ui \
+       IndexUi.ui \
+       LanguageUi.ui \
+       LaTeXUi.ui \
+       ListingsUi.ui \
+       LogUi.ui \
+       MarginsUi.ui \
+       MathMatrixUi.ui \
+       MathsUi.ui \
+       NomenclUi.ui \
+       NoteUi.ui \
+       NumberingUi.ui \
+       PageLayoutUi.ui \
+       ParagraphUi.ui \
+       PreambleUi.ui \
+       PrefColorsUi.ui \
+       PrefConvertersUi.ui \
+       PrefCopiersUi.ui \
+       PrefCygwinPathUi.ui \
+       PrefDateUi.ui \
+       PrefDisplayUi.ui \
+       PrefFileformatsUi.ui \
+       PrefIdentityUi.ui \
+       PrefKeyboardUi.ui \
+       PrefLanguageUi.ui \
+       PrefLatexUi.ui \
+       PrefPathsUi.ui \
+       PrefPlaintextUi.ui \
+       PrefPrinterUi.ui \
+       PrefScreenFontsUi.ui \
+       PrefSpellcheckerUi.ui \
+       PrefsUi.ui \
+       PrefUi.ui \
+       PrintUi.ui \
+       RefUi.ui \
+       SearchUi.ui \
+       SendtoUi.ui \
+       ShowFileUi.ui \
+       SpellcheckerUi.ui \
+       TabularCreateUi.ui \
+       TabularUi.ui \
+       TexinfoUi.ui \
+       TextLayoutUi.ui \
+       ThesaurusUi.ui \
+       TocUi.ui \
+       URLUi.ui \
+       ViewSourceUi.ui \
+       VSpaceUi.ui \
+       WrapUi.ui
+

diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
deleted file mode 100644 (file)
index bea5610..0000000
--- a/src/frontends/qt4/Makefile.dialogs
+++ /dev/null
@@ -1,140 +0,0 @@
-# this is the master file from which the dialog file rules are generated
-
-UIFILES = \
-       AboutUi.ui \
-       AskForTextUi.ui \
-       BibitemUi.ui \
-       BiblioUi.ui \
-       BibtexAddUi.ui \
-       BibtexUi.ui \
-       BoxUi.ui \
-       BranchesUi.ui \
-       BranchUi.ui \
-       BulletsUi.ui \
-       ChangesUi.ui \
-       CharacterUi.ui \
-       CitationUi.ui \
-       DelimiterUi.ui \
-       DocumentUi.ui \
-       ErrorListUi.ui \
-       ERTUi.ui \
-       ExternalUi.ui \
-       FloatPlacementUi.ui \
-       FloatUi.ui \
-       FontUi.ui \
-       GraphicsUi.ui \
-       IncludeUi.ui \
-       IndexUi.ui \
-       LanguageUi.ui \
-       LaTeXUi.ui \
-       ListingsUi.ui \
-       LogUi.ui \
-       MarginsUi.ui \
-       MathMatrixUi.ui \
-       MathsUi.ui \
-       NomenclUi.ui \
-       NoteUi.ui \
-       NumberingUi.ui \
-       PageLayoutUi.ui \
-       ParagraphUi.ui \
-       PreambleUi.ui \
-       PrefColorsUi.ui \
-       PrefConvertersUi.ui \
-       PrefCopiersUi.ui \
-       PrefCygwinPathUi.ui \
-       PrefDateUi.ui \
-       PrefDisplayUi.ui \
-       PrefFileformatsUi.ui \
-       PrefIdentityUi.ui \
-       PrefKeyboardUi.ui \
-       PrefLanguageUi.ui \
-       PrefLatexUi.ui \
-       PrefPathsUi.ui \
-       PrefPlaintextUi.ui \
-       PrefPrinterUi.ui \
-       PrefScreenFontsUi.ui \
-       PrefSpellcheckerUi.ui \
-       PrefsUi.ui \
-       PrefUi.ui \
-       PrintUi.ui \
-       RefUi.ui \
-       SearchUi.ui \
-       SendtoUi.ui \
-       ShowFileUi.ui \
-       SpellcheckerUi.ui \
-       TabularCreateUi.ui \
-       TabularUi.ui \
-       TexinfoUi.ui \
-       TextLayoutUi.ui \
-       ThesaurusUi.ui \
-       TocUi.ui \
-       URLUi.ui \
-       ViewSourceUi.ui \
-       VSpaceUi.ui \
-       WrapUi.ui
-
-MOCFILES = \
-       Action.cpp Action.h \
-       BulletsModule.cpp BulletsModule.h \
-       EmptyTable.cpp EmptyTable.h \
-       LyXFileDialog.cpp LyXFileDialog.h \
-       FloatPlacement.cpp FloatPlacement.h \
-       GuiApplication.cpp GuiApplication.h \
-       GuiImplementation.cpp GuiImplementation.h \
-       GuiView.cpp GuiView.h \
-       GuiWorkArea.cpp GuiWorkArea.h \
-       IconPalette.cpp IconPalette.h \
-       InsertTableWidget.cpp InsertTableWidget.h \
-       LengthCombo.cpp LengthCombo.h \
-       PanelStack.cpp PanelStack.h \
-       QAbout.cpp QAbout.h \
-       QBibitem.cpp QBibitem.h \
-       QBibtex.cpp QBibtex.h \
-       QBox.cpp QBox.h \
-       QBranch.cpp QBranch.h \
-       QBranches.cpp QBranches.h \
-       QChanges.cpp QChanges.h \
-       QCharacter.cpp QCharacter.h \
-       QCitationDialog.cpp QCitationDialog.h \
-       QCommandBuffer.cpp QCommandBuffer.h \
-       QCommandEdit.cpp QCommandEdit.h \
-       QDelimiterDialog.cpp QDelimiterDialog.h \
-       QDocument.cpp QDocument.h \
-       QErrorList.cpp QErrorList.h \
-       QERT.cpp QERT.h \
-       QExternal.cpp QExternal.h \
-       QFloatDialog.cpp QFloatDialog.h \
-       QGraphicsDialog.cpp QGraphicsDialog.h \
-       QInclude.cpp QInclude.h \
-       QIndex.cpp QIndex.h \
-       QLog.cpp QLog.h \
-       QViewSource.cpp QViewSource.h \
-       QListings.cpp QListings.h \
-       QLMenubar.cpp QLMenubar.h \
-       QLPopupMenu.cpp QLPopupMenu.h \
-       QLPrintDialog.cpp QLPrintDialog.h \
-       QMathMatrixDialog.cpp QMathMatrixDialog.h \
-       QNomencl.cpp QNomencl.h \
-       QNote.cpp QNote.h \
-       QParagraph.cpp QParagraph.h \
-       QPrefs.cpp QPrefs.h \
-       QRef.cpp QRef.h \
-       QSearch.cpp QSearch.h \
-       QSendto.cpp QSendto.h \
-       QSetBorder.cpp QSetBorder.h \
-       QShowFile.cpp QShowFile.h \
-       QSpellchecker.cpp QSpellchecker.h \
-       QDialogView.cpp QDialogView.h \
-       QTabularCreate.cpp QTabularCreate.h \
-       QTabular.cpp QTabular.h \
-       QTexinfo.cpp QTexinfo.h \
-       QThesaurus.cpp QThesaurus.h \
-       TocModel.cpp TocModel.h \
-       TocWidget.cpp TocWidget.h \
-       QToc.cpp QToc.h \
-       QURLDialog.cpp QURLDialog.h \
-       QVSpace.cpp QVSpace.h \
-       QWrap.cpp QWrap.h \
-       QLToolbar.cpp QLToolbar.h \
-       socket_callback.cpp socket_callback.h \
-       Validator.cpp Validator.h