anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix building with automake; break scons, cmake and qmake

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19427 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-11 15:48:15 +00:00
parent d9af2acb53
commit 8cea333572
47 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/Makefile.am
View File

@ -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 \

2
src/frontends/qt4/BulletsModule.h
View File

@ -13,7 +13,7 @@
#define QBULLETSMODULE_H
#include "ui/BulletsUi.h"
#include "ui_BulletsUi.h"
#include "Bullet.h"
#include <boost/array.hpp>

2
src/frontends/qt4/FloatPlacement.h
View File

@ -13,7 +13,7 @@
#ifndef QT_FLOATPLACEMENT_H
#define QT_FLOATPLACEMENT_H
#include "ui/FloatPlacementUi.h"
#include "ui_FloatPlacementUi.h"
#include <QWidget>
#include <string>

6
src/frontends/qt4/Makefile.am
View File

@ -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)

2
src/frontends/qt4/QAbout.h
View File

@ -13,7 +13,7 @@
#define FORMABOUT_H
#include "QDialogView.h"
#include "ui/AboutUi.h"
#include "ui_AboutUi.h"
#include <QDialog>
namespace lyx {

2
src/frontends/qt4/QBibitem.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/BibitemUi.h"
#include "ui_BibitemUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QBibtex.cpp
View File

@ -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"

4
src/frontends/qt4/QBibtex.h
View File

@ -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"

2
src/frontends/qt4/QBox.h
View File

@ -15,7 +15,7 @@
#include "QDialogView.h"
#include "ui/BoxUi.h"
#include "ui_BoxUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QBranch.h
View File

@ -13,7 +13,7 @@
#define QBRANCH_H
#include "QDialogView.h"
#include "ui/BranchUi.h"
#include "ui_BranchUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QBranches.h
View File

@ -12,7 +12,7 @@
#ifndef QBRANCHES_H
#define QBRANCHES_H
#include "ui/BranchesUi.h"
#include "ui_BranchesUi.h"
#include "QDocument.h"
#include "BranchList.h"

2
src/frontends/qt4/QChanges.h
View File

@ -13,7 +13,7 @@
#define QCHANGES_H
#include "QDialogView.h"
#include "ui/ChangesUi.h"
#include "ui_ChangesUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QCharacter.h
View File

@ -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"

2
src/frontends/qt4/QCitationDialog.h
View File

@ -14,7 +14,7 @@
#define QCITATIONDIALOG_H
#include "Dialog.h"
#include "ui/CitationUi.h"
#include "ui_CitationUi.h"
#include <QCloseEvent>
#include <QKeyEvent>

2
src/frontends/qt4/QDelimiterDialog.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/DelimiterUi.h"
#include "ui_DelimiterUi.h"
#include <string>

22
src/frontends/qt4/QDocument.h
View File

@ -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>

2
src/frontends/qt4/QERT.h
View File

@ -13,7 +13,7 @@
#define QERT_H
#include "QDialogView.h"
#include "ui/ERTUi.h"
#include "ui_ERTUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QErrorList.h
View File

@ -13,7 +13,7 @@
#define QERRORLIST_H
#include "QDialogView.h"
#include "ui/ErrorListUi.h"
#include "ui_ErrorListUi.h"
#include <QDialog>

2
src/frontends/qt4/QExternal.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/ExternalUi.h"
#include "ui_ExternalUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QFloatDialog.h
View File

@ -12,7 +12,7 @@
#ifndef QFLOATDIALOG_H
#define QFLOATDIALOG_H
#include "ui/FloatUi.h"
#include "ui_FloatUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QGraphicsDialog.h
View File

@ -14,7 +14,7 @@
#ifndef QGRAPHICSDIALOG_H
#define QGRAPHICSDIALOG_H
#include "ui/GraphicsUi.h"
#include "ui_GraphicsUi.h"
#include <QCloseEvent>
#include <QDialog>

2
src/frontends/qt4/QInclude.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/IncludeUi.h"
#include "ui_IncludeUi.h"
#include <QDialog>

2
src/frontends/qt4/QIndex.h
View File

@ -14,7 +14,7 @@
#define QINDEX_H
#include "QDialogView.h"
#include "ui/IndexUi.h"
#include "ui_IndexUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QLPrintDialog.h
View File

@ -13,7 +13,7 @@
#ifndef QLPRINTDIALOG_H
#define QLPRINTDIALOG_H
#include "ui/PrintUi.h"
#include "ui_PrintUi.h"
#include <QDialog>

2
src/frontends/qt4/QListings.h
View File

@ -13,7 +13,7 @@
#define QLISTINGS_H
#include "QDialogView.h"
#include "ui/ListingsUi.h"
#include "ui_ListingsUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QLog.h
View File

@ -15,7 +15,7 @@
#include "QDialogView.h"
#include "ui/LogUi.h"
#include "ui_LogUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QMathMatrixDialog.h
View File

@ -16,7 +16,7 @@
#include "QDialogView.h"
#include "ui/MathMatrixUi.h"
#include "ui_MathMatrixUi.h"
#include <QDialog>

2
src/frontends/qt4/QNomencl.h
View File

@ -15,7 +15,7 @@
#define QNOMENCL_H
#include "QDialogView.h"
#include "ui/NomenclUi.h"
#include "ui_NomenclUi.h"
#include <QDialog>

2
src/frontends/qt4/QNote.h
View File

@ -13,7 +13,7 @@
#define QNOTE_H
#include "QDialogView.h"
#include "ui/NoteUi.h"
#include "ui_NoteUi.h"
#include <QDialog>
class QCloseEvent;

2
src/frontends/qt4/QParagraph.h
View File

@ -16,7 +16,7 @@
#include "QDialogView.h"
#include "Layout.h"
#include "ui/ParagraphUi.h"
#include "ui_ParagraphUi.h"
#include <QDialog>
#include <QCloseEvent>

36
src/frontends/qt4/QPrefs.h
View File

@ -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 {

2
src/frontends/qt4/QRef.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/RefUi.h"
#include "ui_RefUi.h"
#include <QDialog>

2
src/frontends/qt4/QSearch.h
View File

@ -13,7 +13,7 @@
#define QSEARCH_H
#include "QDialogView.h"
#include "ui/SearchUi.h"
#include "ui_SearchUi.h"
#include <string>
#include <QDialog>

2
src/frontends/qt4/QSendto.h
View File

@ -13,7 +13,7 @@
#define QSENDTO_H
#include "QDialogView.h"
#include "ui/SendtoUi.h"
#include "ui_SendtoUi.h"
#include <QDialog>

2
src/frontends/qt4/QShowFile.h
View File

@ -14,7 +14,7 @@
#include "QDialogView.h"
#include "ui/ShowFileUi.h"
#include "ui_ShowFileUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QSpellchecker.h
View File

@ -14,7 +14,7 @@
#define QSPELLCHECKER_H
#include "QDialogView.h"
#include "ui/SpellcheckerUi.h"
#include "ui_SpellcheckerUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QTabular.h
View File

@ -17,7 +17,7 @@
#include "QDialogView.h"
#include "ui/TabularUi.h"
#include "ui_TabularUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QTabularCreate.h
View File

@ -13,7 +13,7 @@
#define QTABULARCREATE_H
#include "QDialogView.h"
#include "ui/TabularCreateUi.h"
#include "ui_TabularCreateUi.h"
#include <QDialog>

2
src/frontends/qt4/QTexinfo.h
View File

@ -15,7 +15,7 @@
#include "QDialogView.h"
#include "ControlTexinfo.h"
#include "ui/TexinfoUi.h"
#include "ui_TexinfoUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QThesaurus.h
View File

@ -13,7 +13,7 @@
#define QTHESAURUS_H
#include "QDialogView.h"
#include "ui/ThesaurusUi.h"
#include "ui_ThesaurusUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QURLDialog.h
View File

@ -12,7 +12,7 @@
#ifndef QURLDIALOG_H
#define QURLDIALOG_H
#include "ui/URLUi.h"
#include "ui_URLUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/QVSpace.h
View File

@ -16,7 +16,7 @@
#include "QDialogView.h"
#include "ui/VSpaceUi.h"
#include "ui_VSpaceUi.h"
#include <QDialog>

2
src/frontends/qt4/QViewSource.h
View File

@ -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>

2
src/frontends/qt4/QWrap.h
View File

@ -13,7 +13,7 @@
#define QWRAP_H
#include "QDialogView.h"
#include "ui/WrapUi.h"
#include "ui_WrapUi.h"
#include <QDialog>
#include <QCloseEvent>

2
src/frontends/qt4/TocWidget.h
View File

@ -13,7 +13,7 @@
#ifndef TOC_WIDGET_H
#define TOC_WIDGET_H
#include "ui/TocUi.h"
#include "ui_TocUi.h"
#include <QWidget>

2
src/frontends/qt4/alert_pimpl.cpp
View File

@ -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"

6
src/tex2lyx/Makefile.am
View File

@ -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 \