From 8cea3335725c34eab38062360a1a37d1c1bc18d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Sat, 11 Aug 2007 15:48:15 +0000 Subject: [PATCH] fix building with automake; break scons, cmake and qmake git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19427 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/client/Makefile.am | 6 ++--- src/frontends/qt4/BulletsModule.h | 2 +- src/frontends/qt4/FloatPlacement.h | 2 +- src/frontends/qt4/Makefile.am | 6 ++--- src/frontends/qt4/QAbout.h | 2 +- src/frontends/qt4/QBibitem.h | 2 +- src/frontends/qt4/QBibtex.cpp | 2 +- src/frontends/qt4/QBibtex.h | 4 +-- src/frontends/qt4/QBox.h | 2 +- src/frontends/qt4/QBranch.h | 2 +- src/frontends/qt4/QBranches.h | 2 +- src/frontends/qt4/QChanges.h | 2 +- src/frontends/qt4/QCharacter.h | 2 +- src/frontends/qt4/QCitationDialog.h | 2 +- src/frontends/qt4/QDelimiterDialog.h | 2 +- src/frontends/qt4/QDocument.h | 22 ++++++++-------- src/frontends/qt4/QERT.h | 2 +- src/frontends/qt4/QErrorList.h | 2 +- src/frontends/qt4/QExternal.h | 2 +- src/frontends/qt4/QFloatDialog.h | 2 +- src/frontends/qt4/QGraphicsDialog.h | 2 +- src/frontends/qt4/QInclude.h | 2 +- src/frontends/qt4/QIndex.h | 2 +- src/frontends/qt4/QLPrintDialog.h | 2 +- src/frontends/qt4/QListings.h | 2 +- src/frontends/qt4/QLog.h | 2 +- src/frontends/qt4/QMathMatrixDialog.h | 2 +- src/frontends/qt4/QNomencl.h | 2 +- src/frontends/qt4/QNote.h | 2 +- src/frontends/qt4/QParagraph.h | 2 +- src/frontends/qt4/QPrefs.h | 36 +++++++++++++-------------- src/frontends/qt4/QRef.h | 2 +- src/frontends/qt4/QSearch.h | 2 +- src/frontends/qt4/QSendto.h | 2 +- src/frontends/qt4/QShowFile.h | 2 +- src/frontends/qt4/QSpellchecker.h | 2 +- src/frontends/qt4/QTabular.h | 2 +- src/frontends/qt4/QTabularCreate.h | 2 +- src/frontends/qt4/QTexinfo.h | 2 +- src/frontends/qt4/QThesaurus.h | 2 +- src/frontends/qt4/QURLDialog.h | 2 +- src/frontends/qt4/QVSpace.h | 2 +- src/frontends/qt4/QViewSource.h | 2 +- src/frontends/qt4/QWrap.h | 2 +- src/frontends/qt4/TocWidget.h | 2 +- src/frontends/qt4/alert_pimpl.cpp | 2 +- src/tex2lyx/Makefile.am | 6 ++--- 47 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index ee58e5c37b..0d660918d7 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -14,9 +14,9 @@ AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) lyxclient_LDADD = \ $(top_builddir)/src/liblyxcore.la \ - $(top_builddir)/src/insets/liblyxinsets.la \ - $(top_builddir)/src/mathed/liblyxmathed.la \ - $(top_builddir)/src/graphics/liblyxgraphics.la \ + $(top_builddir)/src/liblyxinsets.la \ + $(top_builddir)/src/liblyxmathed.la \ + $(top_builddir)/src/liblyxgraphics.la \ $(top_builddir)/src/frontends/liblyxfrontends.la \ $(top_builddir)/src/frontends/controllers/liblyxcontrollers.la \ $(top_builddir)/src/frontends/qt4/liblyxqt4.la \ diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h index d7e667ec09..71838f4ec9 100644 --- a/src/frontends/qt4/BulletsModule.h +++ b/src/frontends/qt4/BulletsModule.h @@ -13,7 +13,7 @@ #define QBULLETSMODULE_H -#include "ui/BulletsUi.h" +#include "ui_BulletsUi.h" #include "Bullet.h" #include diff --git a/src/frontends/qt4/FloatPlacement.h b/src/frontends/qt4/FloatPlacement.h index 6107cb9b2b..581d5d711a 100644 --- a/src/frontends/qt4/FloatPlacement.h +++ b/src/frontends/qt4/FloatPlacement.h @@ -13,7 +13,7 @@ #ifndef QT_FLOATPLACEMENT_H #define QT_FLOATPLACEMENT_H -#include "ui/FloatPlacementUi.h" +#include "ui_FloatPlacementUi.h" #include #include diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 1286d8a7e0..a6326177ed 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -3,9 +3,9 @@ include $(srcdir)/Makefile.dialogs CLEANFILES += *.h CLEANFILES += *_moc.cpp -CLEANFILES += $(UIFILES:%.ui=ui/%.h) +CLEANFILES += $(UIFILES:%.ui=ui_%.h) -BUILT_SOURCES = $(UIFILES:%.ui=ui/%.h) +BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h) BUILT_SOURCES += $(PCH_FILE) BUILT_SOURCES += $(MOCEDFILES) @@ -16,7 +16,7 @@ EXTRA_DIST += Makefile.dialogs # Use _() for localization instead of tr() or trUtf8() UIC4FLAGS=-tr lyx::qt_ -%.h: %.ui +ui_%.h: ui/%.ui $(UIC4) $(UIC4FLAGS) $< -o $@ MOCEDFILES = $(MOCFILES:%.cpp=%_moc.cpp) diff --git a/src/frontends/qt4/QAbout.h b/src/frontends/qt4/QAbout.h index b471606169..92d01e992c 100644 --- a/src/frontends/qt4/QAbout.h +++ b/src/frontends/qt4/QAbout.h @@ -13,7 +13,7 @@ #define FORMABOUT_H #include "QDialogView.h" -#include "ui/AboutUi.h" +#include "ui_AboutUi.h" #include namespace lyx { diff --git a/src/frontends/qt4/QBibitem.h b/src/frontends/qt4/QBibitem.h index cbab43230c..0cfa8493ab 100644 --- a/src/frontends/qt4/QBibitem.h +++ b/src/frontends/qt4/QBibitem.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/BibitemUi.h" +#include "ui_BibitemUi.h" #include #include diff --git a/src/frontends/qt4/QBibtex.cpp b/src/frontends/qt4/QBibtex.cpp index 9bc8bb13fc..bea39e6372 100644 --- a/src/frontends/qt4/QBibtex.cpp +++ b/src/frontends/qt4/QBibtex.cpp @@ -14,7 +14,7 @@ #include "QBibtex.h" -#include "ui/BibtexAddUi.h" +#include "ui_BibtexAddUi.h" #include "Qt2BC.h" #include "qt_helpers.h" #include "Validator.h" diff --git a/src/frontends/qt4/QBibtex.h b/src/frontends/qt4/QBibtex.h index a9e5c49dfe..0cc399f138 100644 --- a/src/frontends/qt4/QBibtex.h +++ b/src/frontends/qt4/QBibtex.h @@ -14,8 +14,8 @@ #include "QDialogView.h" -#include "ui/BibtexUi.h" -#include "ui/BibtexAddUi.h" +#include "ui_BibtexUi.h" +#include "ui_BibtexAddUi.h" #include "ButtonController.h" diff --git a/src/frontends/qt4/QBox.h b/src/frontends/qt4/QBox.h index cf6bbff967..5d8ba616ec 100644 --- a/src/frontends/qt4/QBox.h +++ b/src/frontends/qt4/QBox.h @@ -15,7 +15,7 @@ #include "QDialogView.h" -#include "ui/BoxUi.h" +#include "ui_BoxUi.h" #include #include diff --git a/src/frontends/qt4/QBranch.h b/src/frontends/qt4/QBranch.h index 160e0d22ac..4672b956a5 100644 --- a/src/frontends/qt4/QBranch.h +++ b/src/frontends/qt4/QBranch.h @@ -13,7 +13,7 @@ #define QBRANCH_H #include "QDialogView.h" -#include "ui/BranchUi.h" +#include "ui_BranchUi.h" #include #include diff --git a/src/frontends/qt4/QBranches.h b/src/frontends/qt4/QBranches.h index 1b2d8a42dc..2e52efaf28 100644 --- a/src/frontends/qt4/QBranches.h +++ b/src/frontends/qt4/QBranches.h @@ -12,7 +12,7 @@ #ifndef QBRANCHES_H #define QBRANCHES_H -#include "ui/BranchesUi.h" +#include "ui_BranchesUi.h" #include "QDocument.h" #include "BranchList.h" diff --git a/src/frontends/qt4/QChanges.h b/src/frontends/qt4/QChanges.h index 10baadb326..777b52e9b4 100644 --- a/src/frontends/qt4/QChanges.h +++ b/src/frontends/qt4/QChanges.h @@ -13,7 +13,7 @@ #define QCHANGES_H #include "QDialogView.h" -#include "ui/ChangesUi.h" +#include "ui_ChangesUi.h" #include #include diff --git a/src/frontends/qt4/QCharacter.h b/src/frontends/qt4/QCharacter.h index c8fa8365eb..5bb772601c 100644 --- a/src/frontends/qt4/QCharacter.h +++ b/src/frontends/qt4/QCharacter.h @@ -14,7 +14,7 @@ #define QCHARACTER_H_CONTROLLER #include "QDialogView.h" -#include "ui/CharacterUi.h" +#include "ui_CharacterUi.h" #include #include "controllers/frontend_helpers.h" diff --git a/src/frontends/qt4/QCitationDialog.h b/src/frontends/qt4/QCitationDialog.h index 9a6e14a959..02db24dd39 100644 --- a/src/frontends/qt4/QCitationDialog.h +++ b/src/frontends/qt4/QCitationDialog.h @@ -14,7 +14,7 @@ #define QCITATIONDIALOG_H #include "Dialog.h" -#include "ui/CitationUi.h" +#include "ui_CitationUi.h" #include #include diff --git a/src/frontends/qt4/QDelimiterDialog.h b/src/frontends/qt4/QDelimiterDialog.h index 3b87993f8b..31251553a5 100644 --- a/src/frontends/qt4/QDelimiterDialog.h +++ b/src/frontends/qt4/QDelimiterDialog.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/DelimiterUi.h" +#include "ui_DelimiterUi.h" #include diff --git a/src/frontends/qt4/QDocument.h b/src/frontends/qt4/QDocument.h index 113c57c0b6..7b4c65a373 100644 --- a/src/frontends/qt4/QDocument.h +++ b/src/frontends/qt4/QDocument.h @@ -15,19 +15,19 @@ #include "QDialogView.h" #include "BulletsModule.h" -#include "ui/DocumentUi.h" -#include "ui/FontUi.h" -#include "ui/TextLayoutUi.h" -#include "ui/MathsUi.h" -#include "ui/LaTeXUi.h" -#include "ui/PageLayoutUi.h" -#include "ui/LanguageUi.h" -#include "ui/BiblioUi.h" -#include "ui/NumberingUi.h" -#include "ui/MarginsUi.h" +#include "ui_DocumentUi.h" +#include "ui_FontUi.h" +#include "ui_TextLayoutUi.h" +#include "ui_MathsUi.h" +#include "ui_LaTeXUi.h" +#include "ui_PageLayoutUi.h" +#include "ui_LanguageUi.h" +#include "ui_BiblioUi.h" +#include "ui_NumberingUi.h" +#include "ui_MarginsUi.h" // For the Preamble module -#include "ui/PreambleUi.h" +#include "ui_PreambleUi.h" #include #include diff --git a/src/frontends/qt4/QERT.h b/src/frontends/qt4/QERT.h index dbec4a6828..a942c77fda 100644 --- a/src/frontends/qt4/QERT.h +++ b/src/frontends/qt4/QERT.h @@ -13,7 +13,7 @@ #define QERT_H #include "QDialogView.h" -#include "ui/ERTUi.h" +#include "ui_ERTUi.h" #include #include diff --git a/src/frontends/qt4/QErrorList.h b/src/frontends/qt4/QErrorList.h index bc1c1aafcb..d998c3f8fd 100644 --- a/src/frontends/qt4/QErrorList.h +++ b/src/frontends/qt4/QErrorList.h @@ -13,7 +13,7 @@ #define QERRORLIST_H #include "QDialogView.h" -#include "ui/ErrorListUi.h" +#include "ui_ErrorListUi.h" #include diff --git a/src/frontends/qt4/QExternal.h b/src/frontends/qt4/QExternal.h index d92d95d8f8..51c933d535 100644 --- a/src/frontends/qt4/QExternal.h +++ b/src/frontends/qt4/QExternal.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/ExternalUi.h" +#include "ui_ExternalUi.h" #include #include diff --git a/src/frontends/qt4/QFloatDialog.h b/src/frontends/qt4/QFloatDialog.h index a444710c59..8a203c076a 100644 --- a/src/frontends/qt4/QFloatDialog.h +++ b/src/frontends/qt4/QFloatDialog.h @@ -12,7 +12,7 @@ #ifndef QFLOATDIALOG_H #define QFLOATDIALOG_H -#include "ui/FloatUi.h" +#include "ui_FloatUi.h" #include #include diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/QGraphicsDialog.h index 0b2c2b733e..f1da0671a8 100644 --- a/src/frontends/qt4/QGraphicsDialog.h +++ b/src/frontends/qt4/QGraphicsDialog.h @@ -14,7 +14,7 @@ #ifndef QGRAPHICSDIALOG_H #define QGRAPHICSDIALOG_H -#include "ui/GraphicsUi.h" +#include "ui_GraphicsUi.h" #include #include diff --git a/src/frontends/qt4/QInclude.h b/src/frontends/qt4/QInclude.h index 9381d114d8..8e879fc7eb 100644 --- a/src/frontends/qt4/QInclude.h +++ b/src/frontends/qt4/QInclude.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/IncludeUi.h" +#include "ui_IncludeUi.h" #include diff --git a/src/frontends/qt4/QIndex.h b/src/frontends/qt4/QIndex.h index ea5e64f10e..e3828c4051 100644 --- a/src/frontends/qt4/QIndex.h +++ b/src/frontends/qt4/QIndex.h @@ -14,7 +14,7 @@ #define QINDEX_H #include "QDialogView.h" -#include "ui/IndexUi.h" +#include "ui_IndexUi.h" #include #include diff --git a/src/frontends/qt4/QLPrintDialog.h b/src/frontends/qt4/QLPrintDialog.h index c41aac98d8..12bcef78cc 100644 --- a/src/frontends/qt4/QLPrintDialog.h +++ b/src/frontends/qt4/QLPrintDialog.h @@ -13,7 +13,7 @@ #ifndef QLPRINTDIALOG_H #define QLPRINTDIALOG_H -#include "ui/PrintUi.h" +#include "ui_PrintUi.h" #include diff --git a/src/frontends/qt4/QListings.h b/src/frontends/qt4/QListings.h index 730efccc42..9e4a45563e 100644 --- a/src/frontends/qt4/QListings.h +++ b/src/frontends/qt4/QListings.h @@ -13,7 +13,7 @@ #define QLISTINGS_H #include "QDialogView.h" -#include "ui/ListingsUi.h" +#include "ui_ListingsUi.h" #include #include diff --git a/src/frontends/qt4/QLog.h b/src/frontends/qt4/QLog.h index 5ce6ecb4cf..28b1ebb7d3 100644 --- a/src/frontends/qt4/QLog.h +++ b/src/frontends/qt4/QLog.h @@ -15,7 +15,7 @@ #include "QDialogView.h" -#include "ui/LogUi.h" +#include "ui_LogUi.h" #include #include diff --git a/src/frontends/qt4/QMathMatrixDialog.h b/src/frontends/qt4/QMathMatrixDialog.h index d426f32364..7d7ce07dae 100644 --- a/src/frontends/qt4/QMathMatrixDialog.h +++ b/src/frontends/qt4/QMathMatrixDialog.h @@ -16,7 +16,7 @@ #include "QDialogView.h" -#include "ui/MathMatrixUi.h" +#include "ui_MathMatrixUi.h" #include diff --git a/src/frontends/qt4/QNomencl.h b/src/frontends/qt4/QNomencl.h index fd7bc9ae37..4246a9fc72 100644 --- a/src/frontends/qt4/QNomencl.h +++ b/src/frontends/qt4/QNomencl.h @@ -15,7 +15,7 @@ #define QNOMENCL_H #include "QDialogView.h" -#include "ui/NomenclUi.h" +#include "ui_NomenclUi.h" #include diff --git a/src/frontends/qt4/QNote.h b/src/frontends/qt4/QNote.h index 4c2b75a56c..f39c9e9276 100644 --- a/src/frontends/qt4/QNote.h +++ b/src/frontends/qt4/QNote.h @@ -13,7 +13,7 @@ #define QNOTE_H #include "QDialogView.h" -#include "ui/NoteUi.h" +#include "ui_NoteUi.h" #include class QCloseEvent; diff --git a/src/frontends/qt4/QParagraph.h b/src/frontends/qt4/QParagraph.h index 95c907f01b..624d627f16 100644 --- a/src/frontends/qt4/QParagraph.h +++ b/src/frontends/qt4/QParagraph.h @@ -16,7 +16,7 @@ #include "QDialogView.h" #include "Layout.h" -#include "ui/ParagraphUi.h" +#include "ui_ParagraphUi.h" #include #include diff --git a/src/frontends/qt4/QPrefs.h b/src/frontends/qt4/QPrefs.h index e8cb6b4503..895b617d7b 100644 --- a/src/frontends/qt4/QPrefs.h +++ b/src/frontends/qt4/QPrefs.h @@ -17,30 +17,30 @@ #include "Color.h" #include "LyXRC.h" -#include "ui/PrefsUi.h" +#include "ui_PrefsUi.h" #include #include #include -#include "ui/PrefPlaintextUi.h" -#include "ui/PrefDateUi.h" -#include "ui/PrefKeyboardUi.h" -#include "ui/PrefLatexUi.h" -#include "ui/PrefScreenFontsUi.h" -#include "ui/PrefColorsUi.h" -#include "ui/PrefCygwinPathUi.h" -#include "ui/PrefDisplayUi.h" -#include "ui/PrefPathsUi.h" -#include "ui/PrefSpellcheckerUi.h" -#include "ui/PrefConvertersUi.h" -#include "ui/PrefCopiersUi.h" -#include "ui/PrefFileformatsUi.h" -#include "ui/PrefLanguageUi.h" -#include "ui/PrefPrinterUi.h" -#include "ui/PrefUi.h" -#include "ui/PrefIdentityUi.h" +#include "ui_PrefPlaintextUi.h" +#include "ui_PrefDateUi.h" +#include "ui_PrefKeyboardUi.h" +#include "ui_PrefLatexUi.h" +#include "ui_PrefScreenFontsUi.h" +#include "ui_PrefColorsUi.h" +#include "ui_PrefCygwinPathUi.h" +#include "ui_PrefDisplayUi.h" +#include "ui_PrefPathsUi.h" +#include "ui_PrefSpellcheckerUi.h" +#include "ui_PrefConvertersUi.h" +#include "ui_PrefCopiersUi.h" +#include "ui_PrefFileformatsUi.h" +#include "ui_PrefLanguageUi.h" +#include "ui_PrefPrinterUi.h" +#include "ui_PrefUi.h" +#include "ui_PrefIdentityUi.h" namespace lyx { diff --git a/src/frontends/qt4/QRef.h b/src/frontends/qt4/QRef.h index 9e3e06aae6..02c73ae680 100644 --- a/src/frontends/qt4/QRef.h +++ b/src/frontends/qt4/QRef.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/RefUi.h" +#include "ui_RefUi.h" #include diff --git a/src/frontends/qt4/QSearch.h b/src/frontends/qt4/QSearch.h index 0c279c3750..cae5417ef0 100644 --- a/src/frontends/qt4/QSearch.h +++ b/src/frontends/qt4/QSearch.h @@ -13,7 +13,7 @@ #define QSEARCH_H #include "QDialogView.h" -#include "ui/SearchUi.h" +#include "ui_SearchUi.h" #include #include diff --git a/src/frontends/qt4/QSendto.h b/src/frontends/qt4/QSendto.h index d53b3a3051..dc41f300ca 100644 --- a/src/frontends/qt4/QSendto.h +++ b/src/frontends/qt4/QSendto.h @@ -13,7 +13,7 @@ #define QSENDTO_H #include "QDialogView.h" -#include "ui/SendtoUi.h" +#include "ui_SendtoUi.h" #include diff --git a/src/frontends/qt4/QShowFile.h b/src/frontends/qt4/QShowFile.h index 72b344b61a..24ba3e7ca3 100644 --- a/src/frontends/qt4/QShowFile.h +++ b/src/frontends/qt4/QShowFile.h @@ -14,7 +14,7 @@ #include "QDialogView.h" -#include "ui/ShowFileUi.h" +#include "ui_ShowFileUi.h" #include #include diff --git a/src/frontends/qt4/QSpellchecker.h b/src/frontends/qt4/QSpellchecker.h index 2a72716ee9..b31921278d 100644 --- a/src/frontends/qt4/QSpellchecker.h +++ b/src/frontends/qt4/QSpellchecker.h @@ -14,7 +14,7 @@ #define QSPELLCHECKER_H #include "QDialogView.h" -#include "ui/SpellcheckerUi.h" +#include "ui_SpellcheckerUi.h" #include #include diff --git a/src/frontends/qt4/QTabular.h b/src/frontends/qt4/QTabular.h index b42d22c7c4..d76c38e4b8 100644 --- a/src/frontends/qt4/QTabular.h +++ b/src/frontends/qt4/QTabular.h @@ -17,7 +17,7 @@ #include "QDialogView.h" -#include "ui/TabularUi.h" +#include "ui_TabularUi.h" #include #include diff --git a/src/frontends/qt4/QTabularCreate.h b/src/frontends/qt4/QTabularCreate.h index a4a8e87f2b..f26c231fea 100644 --- a/src/frontends/qt4/QTabularCreate.h +++ b/src/frontends/qt4/QTabularCreate.h @@ -13,7 +13,7 @@ #define QTABULARCREATE_H #include "QDialogView.h" -#include "ui/TabularCreateUi.h" +#include "ui_TabularCreateUi.h" #include diff --git a/src/frontends/qt4/QTexinfo.h b/src/frontends/qt4/QTexinfo.h index ee0c62b3f4..2593431a29 100644 --- a/src/frontends/qt4/QTexinfo.h +++ b/src/frontends/qt4/QTexinfo.h @@ -15,7 +15,7 @@ #include "QDialogView.h" #include "ControlTexinfo.h" -#include "ui/TexinfoUi.h" +#include "ui_TexinfoUi.h" #include #include diff --git a/src/frontends/qt4/QThesaurus.h b/src/frontends/qt4/QThesaurus.h index e4beedf21b..9968443783 100644 --- a/src/frontends/qt4/QThesaurus.h +++ b/src/frontends/qt4/QThesaurus.h @@ -13,7 +13,7 @@ #define QTHESAURUS_H #include "QDialogView.h" -#include "ui/ThesaurusUi.h" +#include "ui_ThesaurusUi.h" #include #include diff --git a/src/frontends/qt4/QURLDialog.h b/src/frontends/qt4/QURLDialog.h index 3cda893fdb..36980227ad 100644 --- a/src/frontends/qt4/QURLDialog.h +++ b/src/frontends/qt4/QURLDialog.h @@ -12,7 +12,7 @@ #ifndef QURLDIALOG_H #define QURLDIALOG_H -#include "ui/URLUi.h" +#include "ui_URLUi.h" #include #include diff --git a/src/frontends/qt4/QVSpace.h b/src/frontends/qt4/QVSpace.h index 862c8d16fb..b8c4c26e90 100644 --- a/src/frontends/qt4/QVSpace.h +++ b/src/frontends/qt4/QVSpace.h @@ -16,7 +16,7 @@ #include "QDialogView.h" -#include "ui/VSpaceUi.h" +#include "ui_VSpaceUi.h" #include diff --git a/src/frontends/qt4/QViewSource.h b/src/frontends/qt4/QViewSource.h index 7871e10e10..06ca89aab6 100644 --- a/src/frontends/qt4/QViewSource.h +++ b/src/frontends/qt4/QViewSource.h @@ -16,7 +16,7 @@ #include "frontends/controllers/ControlViewSource.h" #include "frontends/Application.h" -#include "ui/ViewSourceUi.h" +#include "ui_ViewSourceUi.h" #include #include diff --git a/src/frontends/qt4/QWrap.h b/src/frontends/qt4/QWrap.h index 167f133dcb..fad58ddf9c 100644 --- a/src/frontends/qt4/QWrap.h +++ b/src/frontends/qt4/QWrap.h @@ -13,7 +13,7 @@ #define QWRAP_H #include "QDialogView.h" -#include "ui/WrapUi.h" +#include "ui_WrapUi.h" #include #include diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h index 861d4ad768..2516e3d046 100644 --- a/src/frontends/qt4/TocWidget.h +++ b/src/frontends/qt4/TocWidget.h @@ -13,7 +13,7 @@ #ifndef TOC_WIDGET_H #define TOC_WIDGET_H -#include "ui/TocUi.h" +#include "ui_TocUi.h" #include diff --git a/src/frontends/qt4/alert_pimpl.cpp b/src/frontends/qt4/alert_pimpl.cpp index dbc9f77640..1afb691fec 100644 --- a/src/frontends/qt4/alert_pimpl.cpp +++ b/src/frontends/qt4/alert_pimpl.cpp @@ -14,7 +14,7 @@ #include "Alert_pimpl.h" #include "alert.h" -#include "ui/AskForTextUi.h" +#include "ui_AskForTextUi.h" #include "qt_helpers.h" #include "frontends/Application.h" diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 06d03619ec..b657b58d0d 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -52,9 +52,9 @@ tex2lyx_SOURCES = \ tex2lyx_LDADD = \ $(top_builddir)/src/support/liblyxsupport.la \ $(top_builddir)/src/liblyxcore.la \ - $(top_builddir)/src/insets/liblyxinsets.la \ - $(top_builddir)/src/mathed/liblyxmathed.la \ - $(top_builddir)/src/graphics/liblyxgraphics.la \ + $(top_builddir)/src/liblyxinsets.la \ + $(top_builddir)/src/liblyxmathed.la \ + $(top_builddir)/src/liblyxgraphics.la \ $(top_builddir)/src/frontends/liblyxfrontends.la \ $(top_builddir)/src/frontends/controllers/liblyxcontrollers.la \ $(top_builddir)/src/frontends/qt4/liblyxqt4.la \ -- 2.39.2