anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add --with-qmake options to ./configure. using it overwrites the automake generated Makefiles with qmake generated ones

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19546 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-14 08:03:23 +00:00
parent 0b06fd0118
commit d53be50ec1
3 changed files with 282 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -400,13 +400,17 @@ char * strerror(int n);
]) ])
AC_ARG_WITH(qmake,
AC_HELP_STRING([--with-qmake],
[Use qmake instead of automake to generate Makefiles]),,
[with_qmake=no])
AC_ARG_ENABLE(monolithic-boost, AC_ARG_ENABLE(monolithic-boost,
AC_HELP_STRING([--enable-monolithic-boost], AC_HELP_STRING([--enable-monolithic-boost],
[Use monolithic boost compilations]),, [Use monolithic boost compilations]),,
[enable_monolithic_boost=no]) [enable_monolithic_boost=no])
AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes) AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes)
AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release]) AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info]) AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number]) AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
@ -414,7 +418,7 @@ AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number]) AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
### Finish the work.
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
boost/Makefile \ boost/Makefile \
config/Makefile \ config/Makefile \
@ -439,9 +443,13 @@ AC_CONFIG_FILES([Makefile
src/support/Makefile \ src/support/Makefile \
src/frontends/Makefile \ src/frontends/Makefile \
src/frontends/controllers/Makefile \ src/frontends/controllers/Makefile \
src/frontends/qt4/Makefile \ src/frontends/qt4/Makefile
]) ])
test x$with_qmake = xyes && ${srcdir}/development/qmake/doit
AC_OUTPUT AC_OUTPUT
# show version information # show version information
echo echo

416
development/qmake/qt4/qt4.pro
View File

@ -5,6 +5,8 @@ TARGET = lyxqt4$${DEBUGSUFFIX}
QT = core gui QT = core gui
INCLUDEPATH += $${BUILD_BASE_TARGET_DIR}/qt4
INC += boost INC += boost
INC += . INC += .
INC += src INC += src
@ -12,247 +14,249 @@ INC += src/frontends
INC += src/frontends/controllers INC += src/frontends/controllers
INC += src/frontends/qt4 INC += src/frontends/qt4
HPP += QLMenubar.h HPP += Action.h
HPP += QShowFile.h HPP += BulletsModule.h
HPP += QCitation.h HPP += CheckedLineEdit.h
HPP += socket_callback.h HPP += ColorCache.h
HPP += qlkey.h HPP += DockView.h
HPP += QViewSource.h HPP += EmptyTable.h
HPP += FloatPlacement.h
HPP += GuiApplication.h HPP += GuiApplication.h
HPP += QBibtex.h HPP += GuiClipboard.h
HPP += QVSpace.h HPP += GuiFontLoader.h
HPP += QLToolbar.h HPP += GuiFontMetrics.h
HPP += QIndex.h HPP += GuiImplementation.h
HPP += QWrap.h HPP += GuiSelection.h
HPP += GuiView.h
HPP += GuiWorkArea.h
HPP += IconPalette.h
HPP += InsertTableWidget.h
HPP += LengthCombo.h
HPP += LyXFileDialog.h
HPP += PanelStack.h
HPP += pch.h HPP += pch.h
HPP += QCitationDialog.h HPP += QAbout.h
HPP += QBibitem.h
HPP += QBibtex.h
HPP += QBox.h HPP += QBox.h
HPP += QBranches.h
HPP += QBranch.h
HPP += QChanges.h
HPP += QCharacter.h
HPP += QCitationDialog.h
HPP += QCitation.h
HPP += QCommandBuffer.h
HPP += QCommandEdit.h
HPP += QDelimiterDialog.h
HPP += QDialogView.h
HPP += QDocument.h
HPP += QErrorList.h
HPP += QERT.h HPP += QERT.h
HPP += QExternal.h
HPP += QFloatDialog.h
HPP += QFloat.h
HPP += QFontExample.h
HPP += QGraphicsDialog.h
HPP += QGraphics.h
HPP += QGraphicsUi.h
HPP += QInclude.h
HPP += QIndex.h
HPP += QKeySymbol.h
HPP += QLImage.h
HPP += QListings.h
HPP += qlkey.h
HPP += QLMenubar.h
HPP += QLog.h
HPP += QLPainter.h
HPP += QLPopupMenu.h
HPP += QLPrintDialog.h
HPP += QLToolbar.h
HPP += QMathMatrixDialog.h
HPP += QNomencl.h
HPP += QNote.h
HPP += QParagraph.h
HPP += QPrefs.h HPP += QPrefs.h
HPP += QPrint.h HPP += QPrint.h
HPP += QLog.h
HPP += QRef.h HPP += QRef.h
HPP += QToc.h HPP += QSearch.h
HPP += QThesaurus.h HPP += QSendto.h
HPP += QBranches.h HPP += QSetBorder.h
HPP += IconPalette.h HPP += QShowFile.h
HPP += BulletsModule.h
HPP += QTabular.h
HPP += LyXFileDialog.h
HPP += QDocument.h
HPP += QGraphicsDialog.h
HPP += GuiImplementation.h
HPP += QListings.h
HPP += GuiFontMetrics.h
HPP += GuiWorkArea.h
HPP += Action.h
HPP += QCommandEdit.h
HPP += ColorCache.h
HPP += QBranch.h
HPP += TocWidget.h
HPP += FloatPlacement.h
HPP += Qt2BC.h
HPP += QSpellchecker.h HPP += QSpellchecker.h
HPP += QChanges.h HPP += Qt2BC.h
HPP += QTabularCreate.h HPP += QTabularCreate.h
HPP += QDialogView.h HPP += QTabular.h
HPP += DockView.h HPP += QTexinfo.h
HPP += QKeySymbol.h
HPP += TocModel.h
HPP += qt_helpers.h HPP += qt_helpers.h
HPP += QNomencl.h HPP += QThesaurus.h
HPP += QLImage.h HPP += QToc.h
HPP += QLPrintDialog.h
HPP += QURLDialog.h HPP += QURLDialog.h
HPP += QMathMatrixDialog.h HPP += QViewSource.h
HPP += QBibitem.h HPP += QVSpace.h
HPP += QWrap.h
HPP += socket_callback.h
HPP += TocModel.h
HPP += TocWidget.h
HPP += UrlView.h HPP += UrlView.h
HPP += Validator.h HPP += Validator.h
HPP += QLPainter.h
HPP += QFloat.h
HPP += PanelStack.h
HPP += QCommandBuffer.h
HPP += QTexinfo.h
HPP += QCharacter.h
HPP += LengthCombo.h
HPP += QInclude.h
HPP += QExternal.h
HPP += QSearch.h
HPP += QFontExample.h
HPP += GuiClipboard.h
HPP += QSetBorder.h
HPP += QErrorList.h
HPP += CheckedLineEdit.h
HPP += EmptyTable.h
HPP += QDelimiterDialog.h
HPP += QAbout.h
HPP += QLPopupMenu.h
HPP += GuiFontLoader.h
HPP += QGraphics.h
HPP += GuiView.h
HPP += QSendto.h
HPP += GuiSelection.h
HPP += InsertTableWidget.h
HPP += QParagraph.h
HPP += QFloatDialog.h
HPP += QGraphicsUi.h
HPP += QNote.h
CPP += Action.cpp
CPP += alert_pimpl.cpp
CPP += BulletsModule.cpp
CPP += CheckedLineEdit.cpp
CPP += ColorCache.cpp
CPP += Dialogs.cpp
CPP += EmptyTable.cpp
CPP += FileDialog.cpp
CPP += FloatPlacement.cpp
CPP += GuiApplication.cpp
CPP += GuiClipboard.cpp
CPP += GuiFontLoader.cpp
CPP += GuiFontMetrics.cpp
CPP += GuiImplementation.cpp
CPP += GuiSelection.cpp
CPP += GuiView.cpp
CPP += GuiWorkArea.cpp
CPP += IconPalette.cpp
CPP += InsertTableWidget.cpp
CPP += KeySymbol.cpp
CPP += LengthCombo.cpp
CPP += LyXFileDialog.cpp
CPP += PanelStack.cpp
CPP += QAbout.cpp
CPP += QBibitem.cpp
CPP += QBibtex.cpp
CPP += QBox.cpp
CPP += QBranch.cpp
CPP += QBranches.cpp
CPP += QChanges.cpp
CPP += QCharacter.cpp
CPP += QCitation.cpp
CPP += QCitationDialog.cpp
CPP += QCommandBuffer.cpp CPP += QCommandBuffer.cpp
CPP += QCommandEdit.cpp CPP += QCommandEdit.cpp
CPP += QBranches.cpp CPP += QDelimiterDialog.cpp
CPP += QURLDialog.cpp
CPP += QBibitem.cpp
CPP += GuiImplementation.cpp
CPP += QChanges.cpp
CPP += QBox.cpp
CPP += QERT.cpp
CPP += QSetBorder.cpp
CPP += GuiSelection.cpp
CPP += QPrint.cpp
CPP += Action.cpp
CPP += PanelStack.cpp
CPP += QDialogView.cpp CPP += QDialogView.cpp
CPP += QBranch.cpp CPP += QDocument.cpp
CPP += QCharacter.cpp
CPP += alert_pimpl.cpp
CPP += QListings.cpp
CPP += QLMenubar.cpp
CPP += QViewSource.cpp
CPP += QLPopupMenu.cpp
CPP += QTabular.cpp
CPP += QErrorList.cpp CPP += QErrorList.cpp
CPP += QRef.cpp CPP += QERT.cpp
CPP += QThesaurus.cpp
CPP += QNote.cpp
CPP += GuiFontLoader.cpp
CPP += GuiView.cpp
CPP += QFontExample.cpp
CPP += QNomencl.cpp
CPP += QExternal.cpp CPP += QExternal.cpp
CPP += QFloat.cpp CPP += QFloat.cpp
CPP += IconPalette.cpp
CPP += Validator.cpp
CPP += QDocument.cpp
CPP += QLImage.cpp
CPP += QPrefs.cpp
CPP += QParagraph.cpp
CPP += FloatPlacement.cpp
CPP += QCitationDialog.cpp
CPP += UrlView.cpp
CPP += QTabularCreate.cpp
CPP += EmptyTable.cpp
CPP += QBibtex.cpp
CPP += BulletsModule.cpp
CPP += FileDialog.cpp
CPP += QLog.cpp
CPP += LengthCombo.cpp
CPP += QSendto.cpp
CPP += QShowFile.cpp
CPP += QCitation.cpp
CPP += QVSpace.cpp
CPP += QSearch.cpp
CPP += Dialogs.cpp
CPP += GuiFontMetrics.cpp
CPP += LyXFileDialog.cpp
CPP += ColorCache.cpp
CPP += QFloatDialog.cpp CPP += QFloatDialog.cpp
CPP += KeySymbol.cpp CPP += QFontExample.cpp
CPP += QMathMatrixDialog.cpp
CPP += QToc.cpp
CPP += Qt2BC.cpp
CPP += QSpellchecker.cpp
CPP += QIndex.cpp
CPP += GuiApplication.cpp
CPP += QKeySymbol.cpp
CPP += QGraphicsDialog.cpp
CPP += socket_callback.cpp
CPP += QDelimiterDialog.cpp
CPP += QLToolbar.cpp
CPP += QAbout.cpp
CPP += GuiClipboard.cpp
CPP += QLPainter.cpp
CPP += CheckedLineEdit.cpp
CPP += InsertTableWidget.cpp
CPP += qt_helpers.cpp
CPP += TocWidget.cpp
CPP += QTexinfo.cpp
CPP += TocModel.cpp
CPP += QGraphics.cpp CPP += QGraphics.cpp
CPP += GuiWorkArea.cpp CPP += QGraphicsDialog.cpp
CPP += QInclude.cpp CPP += QInclude.cpp
CPP += QIndex.cpp
CPP += QKeySymbol.cpp
CPP += QLImage.cpp
CPP += QListings.cpp
CPP += QLMenubar.cpp
CPP += QLog.cpp
CPP += QLPainter.cpp
CPP += QLPopupMenu.cpp
CPP += QLPrintDialog.cpp CPP += QLPrintDialog.cpp
CPP += QLToolbar.cpp
CPP += QMathMatrixDialog.cpp
CPP += QNomencl.cpp
CPP += QNote.cpp
CPP += QParagraph.cpp
CPP += QPrefs.cpp
CPP += QPrint.cpp
CPP += QRef.cpp
CPP += QSearch.cpp
CPP += QSendto.cpp
CPP += QSetBorder.cpp
CPP += QShowFile.cpp
CPP += QSpellchecker.cpp
CPP += Qt2BC.cpp
CPP += QTabular.cpp
CPP += QTabularCreate.cpp
CPP += QTexinfo.cpp
CPP += qt_helpers.cpp
CPP += QThesaurus.cpp
CPP += QToc.cpp
CPP += QURLDialog.cpp
CPP += QViewSource.cpp
CPP += QVSpace.cpp
CPP += QWrap.cpp CPP += QWrap.cpp
CPP += socket_callback.cpp
CPP += TocModel.cpp
CPP += TocWidget.cpp
CPP += UrlView.cpp
CPP += Validator.cpp
UI += PrefLanguageUi.ui
UI += PrefKeyboardUi.ui
UI += PrefsUi.ui
UI += MarginsUi.ui
UI += BibitemUi.ui
UI += AskForTextUi.ui
UI += PrefPathsUi.ui
UI += TocUi.ui
UI += IndexUi.ui
UI += ErrorListUi.ui
UI += TabularUi.ui
UI += BulletsUi.ui
UI += FloatPlacementUi.ui
UI += URLUi.ui
UI += AboutUi.ui UI += AboutUi.ui
UI += FloatUi.ui UI += AskForTextUi.ui
UI += BibitemUi.ui
UI += BiblioUi.ui
UI += BibtexAddUi.ui
UI += BibtexUi.ui UI += BibtexUi.ui
UI += BoxUi.ui
UI += BranchesUi.ui
UI += BranchUi.ui
UI += BulletsUi.ui
UI += ChangesUi.ui UI += ChangesUi.ui
UI += WrapUi.ui UI += CharacterUi.ui
UI += CitationUi.ui
UI += DelimiterUi.ui
UI += DocumentUi.ui
UI += ErrorListUi.ui
UI += ERTUi.ui
UI += ExternalUi.ui
UI += FloatPlacementUi.ui
UI += FloatUi.ui
UI += FontUi.ui
UI += GraphicsUi.ui
UI += IncludeUi.ui
UI += IndexUi.ui
UI += LanguageUi.ui
UI += LaTeXUi.ui
UI += ListingsUi.ui
UI += LogUi.ui UI += LogUi.ui
UI += TextLayoutUi.ui UI += MarginsUi.ui
UI += MathMatrixUi.ui
UI += MathsUi.ui
UI += NomenclUi.ui
UI += NoteUi.ui
UI += NumberingUi.ui
UI += PageLayoutUi.ui
UI += ParagraphUi.ui
UI += PreambleUi.ui
UI += PrefColorsUi.ui
UI += PrefConvertersUi.ui
UI += PrefCopiersUi.ui UI += PrefCopiersUi.ui
UI += PrefCygwinPathUi.ui UI += PrefCygwinPathUi.ui
UI += ShowFileUi.ui
UI += GraphicsUi.ui
UI += NomenclUi.ui
UI += SpellcheckerUi.ui
UI += VSpaceUi.ui
UI += ParagraphUi.ui
UI += PrefColorsUi.ui
UI += BranchesUi.ui
UI += SearchUi.ui
UI += ListingsUi.ui
UI += PreambleUi.ui
UI += PageLayoutUi.ui
UI += LaTeXUi.ui
UI += PrefPrinterUi.ui
UI += RefUi.ui
UI += PrefFileformatsUi.ui
UI += CitationUi.ui
UI += CharacterUi.ui
UI += BoxUi.ui
UI += LanguageUi.ui
UI += BibtexAddUi.ui
UI += FontUi.ui
UI += DocumentUi.ui
UI += PrintUi.ui
UI += PrefDisplayUi.ui
UI += ViewSourceUi.ui
UI += PrefPlaintextUi.ui
UI += ThesaurusUi.ui
UI += PrefSpellcheckerUi.ui
UI += NumberingUi.ui
UI += TabularCreateUi.ui
UI += ERTUi.ui
UI += TexinfoUi.ui
UI += PrefLatexUi.ui
UI += DelimiterUi.ui
UI += PrefDateUi.ui UI += PrefDateUi.ui
UI += PrefConvertersUi.ui UI += PrefDisplayUi.ui
UI += MathMatrixUi.ui UI += PrefFileformatsUi.ui
UI += PrefUi.ui UI += PrefIdentityUi.ui
UI += MathsUi.ui UI += PrefKeyboardUi.ui
UI += BranchUi.ui UI += PrefLanguageUi.ui
UI += NoteUi.ui UI += PrefLatexUi.ui
UI += BiblioUi.ui UI += PrefPathsUi.ui
UI += PrefPlaintextUi.ui
UI += PrefPrinterUi.ui
UI += PrefScreenFontsUi.ui UI += PrefScreenFontsUi.ui
UI += IncludeUi.ui UI += PrefSpellcheckerUi.ui
UI += PrefsUi.ui
UI += PrefUi.ui
UI += PrintUi.ui
UI += RefUi.ui
UI += SearchUi.ui
UI += SendtoUi.ui UI += SendtoUi.ui
UI += ShowFileUi.ui
UI += SpellcheckerUi.ui
UI += TabularCreateUi.ui
UI += TabularUi.ui
UI += TexinfoUi.ui
UI += TextLayoutUi.ui
UI += ThesaurusUi.ui
UI += TocUi.ui
UI += URLUi.ui
UI += ViewSourceUi.ui
UI += VSpaceUi.ui
UI += WrapUi.ui
BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4 BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4

42
development/qmake/src/src.pro
View File

@ -229,7 +229,30 @@ BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4
QMAKE_RUN_CXX1 = $(CXX) -c $(CXXFLAGS) $(INCPATH) QMAKE_RUN_CXX1 = $(CXX) -c $(CXXFLAGS) $(INCPATH)
packagetarget.target = $${BUILD_BASE_TARGET_DIR}/src/Package.cpp #packagetarget.target = Package.cpp
#packagetarget.commands = \
# @rm -f tmp_package ;\
# sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
#s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
#s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
#s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
# $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\
# if cmp -s tmp_package Package.cpp ; then \
# rm -f tmp_package ;\
# else \
# rm -f Package.cpp ;\
# cp tmp_package Package.cpp ;\
# fi
#packagetarget.depends = config.h
#packagetarget.variable_out = SOURCES
#packagetarget.CONFIG = no_link
##SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
#QMAKE_EXTRA_TARGETS += packagetarget
#
##OBJECTS += $(OBJECTS_DIR)/Package.o
#POST_TARGETDEPS += $(OBJECTS_DIR)/Package.o
packagetarget.target = Package.cpp
packagetarget.commands = \ packagetarget.commands = \
@rm -f tmp_package ;\ @rm -f tmp_package ;\
sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\ sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
@ -246,10 +269,21 @@ s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
packagetarget.depends = config.h packagetarget.depends = config.h
packagetarget.CONFIG = no_link packagetarget.CONFIG = no_link
#SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp #SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
QMAKE_EXTRA_TARGETS += packagetarget
#OBJECTS += $(OBJECTS_DIR)/Package.o packagetarget2.target = Package.o
POST_TARGETDEPS += $(OBJECTS_DIR)/Package.o packagetarget2.commands = $${QMAKE_RUN_CXX1} -c Package.cpp -o Package.o
packagetarget2.depends = Package.cpp config.h
QMAKE_EXTRA_TARGETS += configtarget
QMAKE_EXTRA_TARGETS += versiontarget versiontarget2
QMAKE_EXTRA_TARGETS += packagetarget packagetarget2
QMAKE_CLEAN += Package.o Package.cpp
PRE_TARGETDEPS += Package.o
LIBS += Package.o
for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} }
for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} }