BUILT_SOURCES += $(MOCEDFILES)
BUILT_SOURCES += Resources.cpp Resources.qrc
-CLEANFILES += $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
######################### Qt stuff #############################
# Use _() for localization instead of tr() or trUtf8()
-UIC4FLAGS=-tr lyx::qt_
+UICFLAGS=-tr lyx::qt_
+# The ui_%.h pattern must match the filter in ../../../po/Rules-lyx
ui_%.h: ui/%.ui
- $(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
+ $(AM_V_GEN)$(QT_UIC) $(UICFLAGS) $< -o $@
MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+QT_VERSION = $(shell IFS=.; set -- `echo $(QTLIB_VERSION)`; \
+ echo 0x0`echo "obase=16; $$1*65536+$$2*256+$$3" | bc`)
+
+# The moc_%.cpp pattern must match the filter in ../../../po/Rules-lyx
moc_%.cpp: %.h
- $(AM_V_GEN)$(MOC4) -o $@ $<
+ $(AM_V_GEN)$(QT_MOC) -DQT_VERSION=$(QT_VERSION) -o $@ $<
Resources.qrc: Makefile
$(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
- find $(top_srcdir)/lib/images -name '*.png' \
+ find $(top_srcdir)/lib/images -name '*.svgz' -o -name '*.png' -o -name '*.gif' \
| sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
>> $@ ;\
echo "</qresource></RCC>" >> $@
Resources.cpp: Resources.qrc
- $(AM_V_GEN)$(RCC4) $< -name Resources -o $@
+ $(AM_V_GEN)$(QT_RCC) $< -name Resources -o $@
######################### LIBRARIES #############################
liblyxqt4_a_DEPENDENCIES = $(MOCEDFILES)
AM_CPPFLAGS += \
- $(QT4_CPPFLAGS) \
+ $(QT_CPPFLAGS) \
-DQT_NO_CAST_TO_ASCII \
-DQT_NO_STL \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/images \
- $(QT4_INCLUDES) $(BOOST_INCLUDES)
+ $(QT_INCLUDES) \
+ $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
SOURCEFILES = \
ButtonPolicy.cpp \
ButtonPolicy.h \
Dialog.cpp \
Dialog.h \
- Resources.cpp \
Action.cpp \
BulletsModule.cpp \
ButtonController.cpp \
+ CategorizedCombo.cpp \
ColorCache.cpp \
CustomizedWidgets.cpp \
+ DialogView.cpp \
+ DockView.cpp \
EmptyTable.cpp \
+ FancyLineEdit.cpp \
FileDialog.cpp \
FindAndReplace.cpp \
FloatPlacement.cpp \
GuiCommandBuffer.cpp \
GuiCommandEdit.cpp \
GuiCompare.cpp \
+ GuiCompareHistory.cpp \
GuiCompleter.cpp \
GuiDelimiter.cpp \
GuiDialog.cpp \
GuiErrorList.cpp \
GuiERT.cpp \
GuiExternal.cpp \
- GuiFloat.cpp \
GuiFontExample.cpp \
GuiFontLoader.cpp \
GuiFontMetrics.cpp \
GuiInfo.cpp \
GuiKeySymbol.cpp \
GuiLabel.cpp \
+ GuiLine.cpp \
GuiListings.cpp \
GuiLog.cpp \
GuiMathMatrix.cpp \
- GuiNomencl.cpp \
+ GuiNomenclature.cpp \
GuiNote.cpp \
GuiPainter.cpp \
GuiParagraph.cpp \
GuiPhantom.cpp \
GuiPrefs.cpp \
- GuiPrint.cpp \
GuiPrintindex.cpp \
GuiPrintNomencl.cpp \
GuiProgress.cpp \
GuiWorkArea.cpp \
GuiWrap.cpp \
IconPalette.cpp \
+ InGuiThread.cpp \
InsertTableWidget.cpp \
+ InsetParamsDialog.cpp \
+ InsetParamsWidget.cpp \
LengthCombo.cpp \
LyXFileDialog.cpp \
LaTeXHighlighter.cpp \
TocModel.cpp \
TocWidget.cpp \
Toolbars.cpp \
+ ToolTipFormatter.cpp \
Validator.cpp
NOMOCHEADER = \
ButtonController.h \
ColorCache.h \
- DialogView.h \
- DockView.h \
FileDialog.h \
GuiFontExample.h \
GuiFontLoader.h \
GuiImage.h \
GuiKeySymbol.h \
GuiPainter.h \
+ GuiWorkArea_Private.h \
LaTeXHighlighter.h \
qt_i18n.h \
qt_helpers.h \
MOCHEADER = \
Action.h \
BulletsModule.h \
+ CategorizedCombo.h \
CustomizedWidgets.h \
+ DialogView.h \
+ DockView.h \
EmptyTable.h \
+ FancyLineEdit.h \
FindAndReplace.h \
FloatPlacement.h \
GuiAbout.h \
GuiCommandBuffer.h \
GuiCommandEdit.h \
GuiCompare.h \
+ GuiCompareHistory.h \
GuiCompleter.h \
GuiDelimiter.h \
GuiDialog.h \
GuiErrorList.h \
GuiERT.h \
GuiExternal.h \
- GuiFloat.h \
GuiGraphics.h \
GuiHSpace.h \
GuiHyperlink.h \
GuiIndices.h \
GuiInfo.h \
GuiLabel.h \
+ GuiLine.h \
GuiListings.h \
GuiLog.h \
GuiMathMatrix.h \
- GuiNomencl.h \
+ GuiNomenclature.h \
GuiNote.h \
GuiParagraph.h \
GuiPhantom.h \
GuiPrefs.h \
- GuiPrint.h \
GuiPrintindex.h \
GuiPrintNomencl.h \
GuiProgress.h \
GuiWorkArea.h \
GuiWrap.h \
IconPalette.h \
+ InGuiThread.h \
InsertTableWidget.h \
+ InsetParamsDialog.h \
+ InsetParamsWidget.h \
LayoutBox.h \
LengthCombo.h \
LyXFileDialog.h \
PanelStack.h \
TocModel.h \
TocWidget.h \
+ ToolTipFormatter.h \
Validator.h
UIFILES = \
AboutUi.ui \
- AskForTextUi.ui \
BibitemUi.ui \
BiblioUi.ui \
BibtexAddUi.ui \
ChangesUi.ui \
CharacterUi.ui \
CitationUi.ui \
+ ColorUi.ui \
CompareUi.ui \
+ CompareHistoryUi.ui \
DelimiterUi.ui \
DocumentUi.ui \
ErrorListUi.ui \
ExternalUi.ui \
FindAndReplaceUi.ui \
FloatPlacementUi.ui \
- FloatUi.ui \
FontUi.ui \
GraphicsUi.ui \
HSpaceUi.ui \
IndexUi.ui \
IndicesUi.ui \
InfoUi.ui \
+ InsetParamsUi.ui \
LabelUi.ui \
LanguageUi.ui \
LaTeXUi.ui \
+ LineUi.ui \
ListingsUi.ui \
ListingsSettingsUi.ui \
+ LocalLayoutUi.ui \
LogUi.ui \
MarginsUi.ui \
+ MasterChildUi.ui \
MathMatrixUi.ui \
MathsUi.ui \
ModulesUi.ui \
PrefColorsUi.ui \
PrefCompletionUi.ui \
PrefConvertersUi.ui \
- PrefDateUi.ui \
+ PrefDocHandlingUi.ui \
+ PrefOutputUi.ui \
PrefDisplayUi.ui \
PrefEditUi.ui \
PrefFileformatsUi.ui \
PrefLanguageUi.ui \
PrefLatexUi.ui \
PrefPathsUi.ui \
- PrefPlaintextUi.ui \
- PrefPrinterUi.ui \
PrefScreenFontsUi.ui \
PrefShortcutsUi.ui \
PrefSpellcheckerUi.ui \
PrefsUi.ui \
PrefUi.ui \
- PrintUi.ui \
PrintindexUi.ui \
PrintNomenclUi.ui \
ProgressViewUi.ui \
VSpaceUi.ui \
WrapUi.ui
+nodist_liblyxqt4_a_SOURCES = Resources.cpp
liblyxqt4.cpp:
- @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
+ $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
-if MONOLITHIC_FRONTEND_QT4
+if MONOLITHIC_FRONTEND_QT
+nodist_liblyxqt4_a_SOURCES += liblyxqt4.cpp
liblyxqt4_a_SOURCES = \
- liblyxqt4.cpp \
$(MOCHEADER) \
$(NOMOCHEADER)
$(MOCHEADER) \
$(NOMOCHEADER)
-EXTRA_DIST = pch.h ui/compile_uic.sh $(UIFILES:%=ui/%)
-BUILT_SOURCES += $(PCH_FILE)
-AM_CPPFLAGS += $(PCH_FLAGS)
-
-
endif
+
+EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)
projects / lyx.git / blobdiff