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

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index ee58e5c37bbb39ef5e5f63a7eac103ac0803a3c3..0d660918d788a3e9eaac8739660d03dbe8b800ba 100644 (file)
--- 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 d7e667ec099defde7d57712dc6053805a527dd35..71838f4ec97ca985f9f0c9946f05266596a25072 100644 (file)
--- 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 <boost/array.hpp>
 

diff --git a/src/frontends/qt4/FloatPlacement.h b/src/frontends/qt4/FloatPlacement.h
index 6107cb9b2ba3cbdf447ce78b2ea67dd0497f0142..581d5d711a4bd6d17cf783c70092d19e15044ba6 100644 (file)
--- 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 <QWidget>
 
 #include <string>

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 1286d8a7e029ef6c33bde3362c678ce801da893a..a6326177edf67aa80e351fae52d8302c0c27b1d6 100644 (file)
--- 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 b471606169d16721f737c29edd38e30d942bb531..92d01e992cc6437fb6f0b74f3a35ffd25af6cf61 100644 (file)
--- 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 <QDialog>
 
 namespace lyx {

diff --git a/src/frontends/qt4/QBibitem.h b/src/frontends/qt4/QBibitem.h
index cbab43230ce00c117f911994b1a1c9375f76434e..0cfa8493abd7ac5dcff05597a80618b16dc67402 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QBibtex.cpp b/src/frontends/qt4/QBibtex.cpp
index 9bc8bb13fce8bfe614fc16e72db8c2b532dae852..bea39e63725d874338f7bf02ffadf28db8e82130 100644 (file)
--- 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 a9e5c49dfe7ea1397946f33f5f21efcb2f741449..0cc399f138fd82579eaa1d3c9464dc8277b64bcf 100644 (file)
--- 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 cf6bbff96760279466b00f92adc0c5c510d5356c..5d8ba616ece91401af2c86f9118ff673b70dd01d 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QBranch.h b/src/frontends/qt4/QBranch.h
index 160e0d22ac0c0f27451f27f049f746909a70f9cd..4672b956a52eb90eb5553242c7065177a9235f7e 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QBranches.h b/src/frontends/qt4/QBranches.h
index 1b2d8a42dc28f3f003364e14dd1b63273df4bac6..2e52efaf2888f40d1ca015ba37ecf9be049cc9aa 100644 (file)
--- 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 10baadb3266b22ae28273cde0c94c714e56f8ea3..777b52e9b4691eab6f445e1543d592dfcfe4929c 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>
 

diff --git a/src/frontends/qt4/QCharacter.h b/src/frontends/qt4/QCharacter.h
index c8fa8365eb86fbe952759dbe940584cc63951993..5bb772601c810b42adcef675ba7e9870272e0105 100644 (file)
--- 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 <QDialog>
 
 #include "controllers/frontend_helpers.h"

diff --git a/src/frontends/qt4/QCitationDialog.h b/src/frontends/qt4/QCitationDialog.h
index 9a6e14a959dcf2ab5d317635d329be1817d09d34..02db24dd39257d136e7b03e8cbd850410aaa90e2 100644 (file)
--- 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 <QCloseEvent>
 #include <QKeyEvent>

diff --git a/src/frontends/qt4/QDelimiterDialog.h b/src/frontends/qt4/QDelimiterDialog.h
index 3b87993f8b4ad328ae4e13b9dde445017d203e43..31251553a5467ce955736b54bc28620f76671ceb 100644 (file)
--- 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 <string>
 

diff --git a/src/frontends/qt4/QDocument.h b/src/frontends/qt4/QDocument.h
index 113c57c0b6ae69016fbb885b891541186df2b32c..7b4c65a373b42562c1473abd6d3a93603b88b729 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QERT.h b/src/frontends/qt4/QERT.h
index dbec4a6828780c7c9a1a59183174034c7c5498d3..a942c77fda7a2b732998f7cf50b982f0257f1612 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QErrorList.h b/src/frontends/qt4/QErrorList.h
index bc1c1aafcb7384abf45a864a6d119cfeef7e3a6d..d998c3f8fd81b0eb0a916664cb65514f2a9408b9 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QExternal.h b/src/frontends/qt4/QExternal.h
index d92d95d8f80bb8575bb7a91fb1088f67ecbda8eb..51c933d535a5d1b8a2aa606faf7fff7ef9cd702f 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QFloatDialog.h b/src/frontends/qt4/QFloatDialog.h
index a444710c599a112da34f990da92821a071b46052..8a203c076a2c9278d149c4f014126cc7fbbb3d05 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/QGraphicsDialog.h
index 0b2c2b733e3c16829b912c74a9cea5506e826b85..f1da0671a87e85ee2e3e84175b732ef34728f981 100644 (file)
--- 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 <QCloseEvent>
 #include <QDialog>

diff --git a/src/frontends/qt4/QInclude.h b/src/frontends/qt4/QInclude.h
index 9381d114d85285bd5d26a64d75598eddbc84bbb1..8e879fc7eb1d835378d1e8dfb285d021ede2d444 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QIndex.h b/src/frontends/qt4/QIndex.h
index ea5e64f10e1e00f7f7f59049c7a0cad3c7b08f1e..e3828c4051265a8c1589ab5e2a110f6b814a316c 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QLPrintDialog.h b/src/frontends/qt4/QLPrintDialog.h
index c41aac98d8f8abfa77e3e6213dcaebec82dd5727..12bcef78cc5af2210cae80e01137e9011b6df109 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QListings.h b/src/frontends/qt4/QListings.h
index 730efccc42d5d033790bc14271e5ee93c0dbf751..9e4a45563e063367ef5149558300a90442937739 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QLog.h b/src/frontends/qt4/QLog.h
index 5ce6ecb4cf3ce3d7a9bf74e298c7a9c6fd986a19..28b1ebb7d352454c65ea48ebe960056cc91a553e 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QMathMatrixDialog.h b/src/frontends/qt4/QMathMatrixDialog.h
index d426f32364677528726cc38e178706e37fd61e88..7d7ce07dae25fba82e6dfe2730e2db8502a95b37 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QNomencl.h b/src/frontends/qt4/QNomencl.h
index fd7bc9ae3733c887c19587ece5367adc2140762d..4246a9fc72c7a9ecce6e58cad15d8e67bab7b971 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QNote.h b/src/frontends/qt4/QNote.h
index 4c2b75a56c0e20ccb916a9fed0e70ce23eafde3d..f39c9e9276c0a2f24db24c27cf0aa08db4502dd4 100644 (file)
--- 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 <QDialog>
 class QCloseEvent;

diff --git a/src/frontends/qt4/QParagraph.h b/src/frontends/qt4/QParagraph.h
index 95c907f01b62d926b6b240e37b1e7092e358e6b5..624d627f1688ad321ac1247df95bf25058eb5355 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QPrefs.h b/src/frontends/qt4/QPrefs.h
index e8cb6b4503847753a9e676f50cbc42bbd75d9eb1..895b617d7b23276caf0b4f4504894704e459efab 100644 (file)
--- 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 <vector>
 
 #include <QDialog>
 #include <QCloseEvent>
 
-#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 9e3e06aae6731ad469eb9cd51fd5ed91a71d265a..02c73ae680f040db54957839c1c7d163859695e0 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QSearch.h b/src/frontends/qt4/QSearch.h
index 0c279c3750623c164bfd52c884c6640b6aeac051..cae5417ef0c70a9c76cdf6e67402c7dfb4d3ccb0 100644 (file)
--- 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 <string>
 
 #include <QDialog>

diff --git a/src/frontends/qt4/QSendto.h b/src/frontends/qt4/QSendto.h
index d53b3a3051fc52bcbf1a7d630139eeb0930dd541..dc41f300caab324fca845c775c5eec0d43ac15c5 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QShowFile.h b/src/frontends/qt4/QShowFile.h
index 72b344b61a7b6b7474835b05068e446447020143..24ba3e7ca3811ae53b8fb4576ae08513124b7074 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QSpellchecker.h b/src/frontends/qt4/QSpellchecker.h
index 2a72716ee91b7993999bba729a0b9ab1ab8e56e9..b31921278dbaec3bea215de27fb0f7d7e9114978 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QTabular.h b/src/frontends/qt4/QTabular.h
index b42d22c7c48fa18135231aa4ccf01b2d67ea71bc..d76c38e4b86de91805a2a2940a9286287218c9d9 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QTabularCreate.h b/src/frontends/qt4/QTabularCreate.h
index a4a8e87f2b5f52eb1c4c514c44d8a054fef0c8bd..f26c231fea0d6268d4ae7a6c007c405dd16d3fab 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QTexinfo.h b/src/frontends/qt4/QTexinfo.h
index ee0c62b3f421aae28f496fc2002e362cc491ce41..2593431a293ccf79276f1137ffd78fc70e796707 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QThesaurus.h b/src/frontends/qt4/QThesaurus.h
index e4beedf21b56adb08931969c662e60e0de35e755..996844378301074abd9cd7e3b6f64512230a81fd 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QURLDialog.h b/src/frontends/qt4/QURLDialog.h
index 3cda893fdba412ab3aec4d7dc92c0787e4fbc7aa..36980227ad4acb60df6e22a19dd33852d075b47c 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/QVSpace.h b/src/frontends/qt4/QVSpace.h
index 862c8d16fb93fab7b47820981b25fcbdc44096e4..b8c4c26e9079c6df7bdba922175c6bc84b5bdda1 100644 (file)
--- 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 <QDialog>
 

diff --git a/src/frontends/qt4/QViewSource.h b/src/frontends/qt4/QViewSource.h
index 7871e10e10fe8eef56738cf703e095ab2961d2da..06ca89aab63fcaba4f8b31a51f1d45975cbfe859 100644 (file)
--- 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 <QWidget>
 #include <QSyntaxHighlighter>

diff --git a/src/frontends/qt4/QWrap.h b/src/frontends/qt4/QWrap.h
index 167f133dcb0d43be4878785bf0e41e2abe3178d2..fad58ddf9c46944b47ebbbad6386af2680b6c73d 100644 (file)
--- 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 <QDialog>
 #include <QCloseEvent>

diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h
index 861d4ad768df6afb5df4e56facd07bc17426bbdc..2516e3d046f3cbbd24ebeb47b003b6d02757a804 100644 (file)
--- 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 <QWidget>
 

diff --git a/src/frontends/qt4/alert_pimpl.cpp b/src/frontends/qt4/alert_pimpl.cpp
index dbc9f776402b78d2d15d483755c6d331f26b96d1..1afb691fec1345902820a93fee04a86d46742d09 100644 (file)
--- 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 06d03619ec7e9edae7a5a8af82e0f37b8ab2a9fa..b657b58d0d97528d1b650cd33de773a55f78957f 100644 (file)
--- 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 \