X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMakefile.am;h=66a86bb227f695c2c7077be66f3ff49b987877e9;hb=1f10969bb5c5f36017bf5ba8671381b09945cf57;hp=9dd823d8de4fda33eeff4fcb83384856787ad7f7;hpb=17986e7509f05a79446423a9a32c762cb19a3429;p=lyx.git diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 9dd823d8de..66a86bb227 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -4,29 +4,34 @@ BUILT_SOURCES = $(UIFILES:%.ui=ui_%.h) 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 - $(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 - $(MOC4) -o $@ $< + $(AM_V_GEN)$(QT_MOC) -DQT_VERSION=$(QT_VERSION) -o $@ $< Resources.qrc: Makefile - echo "" > $@ - find $(top_srcdir)/lib/images -name '*.png' \ + $(AM_V_GEN)echo "" > $@ ; \ + find $(top_srcdir)/lib/images -name '*.svgz' -o -name '*.png' -o -name '*.gif' \ | sed -e 's:$(top_srcdir)/lib/\(.*\):&:' \ - >> $@ + >> $@ ;\ echo "" >> $@ Resources.cpp: Resources.qrc - $(RCC4) $< -name Resources -o $@ + $(AM_V_GEN)$(QT_RCC) $< -name Resources -o $@ ######################### LIBRARIES ############################# @@ -36,26 +41,30 @@ noinst_LIBRARIES = liblyxqt4.a 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 \ @@ -73,6 +82,8 @@ SOURCEFILES = \ GuiClipboard.cpp \ GuiCommandBuffer.cpp \ GuiCommandEdit.cpp \ + GuiCompare.cpp \ + GuiCompareHistory.cpp \ GuiCompleter.cpp \ GuiDelimiter.cpp \ GuiDialog.cpp \ @@ -80,7 +91,6 @@ SOURCEFILES = \ GuiErrorList.cpp \ GuiERT.cpp \ GuiExternal.cpp \ - GuiFloat.cpp \ GuiFontExample.cpp \ GuiFontLoader.cpp \ GuiFontMetrics.cpp \ @@ -95,18 +105,20 @@ SOURCEFILES = \ 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 \ + GuiProgressView.cpp \ GuiRef.cpp \ GuiSearch.cpp \ GuiSelection.cpp \ @@ -128,23 +140,26 @@ SOURCEFILES = \ GuiWorkArea.cpp \ GuiWrap.cpp \ IconPalette.cpp \ + InGuiThread.cpp \ InsertTableWidget.cpp \ + InsetParamsDialog.cpp \ + InsetParamsWidget.cpp \ LengthCombo.cpp \ LyXFileDialog.cpp \ LaTeXHighlighter.cpp \ + LayoutBox.cpp \ Menus.cpp \ PanelStack.cpp \ qt_helpers.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 \ @@ -153,6 +168,7 @@ NOMOCHEADER = \ GuiImage.h \ GuiKeySymbol.h \ GuiPainter.h \ + GuiWorkArea_Private.h \ LaTeXHighlighter.h \ qt_i18n.h \ qt_helpers.h \ @@ -161,8 +177,12 @@ NOMOCHEADER = \ MOCHEADER = \ Action.h \ BulletsModule.h \ + CategorizedCombo.h \ CustomizedWidgets.h \ + DialogView.h \ + DockView.h \ EmptyTable.h \ + FancyLineEdit.h \ FindAndReplace.h \ FloatPlacement.h \ GuiAbout.h \ @@ -178,6 +198,8 @@ MOCHEADER = \ GuiClipboard.h \ GuiCommandBuffer.h \ GuiCommandEdit.h \ + GuiCompare.h \ + GuiCompareHistory.h \ GuiCompleter.h \ GuiDelimiter.h \ GuiDialog.h \ @@ -185,7 +207,6 @@ MOCHEADER = \ GuiErrorList.h \ GuiERT.h \ GuiExternal.h \ - GuiFloat.h \ GuiGraphics.h \ GuiHSpace.h \ GuiHyperlink.h \ @@ -194,17 +215,19 @@ MOCHEADER = \ 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 \ + GuiProgressView.h \ GuiRef.h \ GuiSearch.h \ GuiSelection.h \ @@ -226,18 +249,22 @@ MOCHEADER = \ GuiWorkArea.h \ GuiWrap.h \ IconPalette.h \ + InGuiThread.h \ InsertTableWidget.h \ + InsetParamsDialog.h \ + InsetParamsWidget.h \ + LayoutBox.h \ LengthCombo.h \ LyXFileDialog.h \ Menus.h \ PanelStack.h \ TocModel.h \ TocWidget.h \ + ToolTipFormatter.h \ Validator.h UIFILES = \ AboutUi.ui \ - AskForTextUi.ui \ BibitemUi.ui \ BiblioUi.ui \ BibtexAddUi.ui \ @@ -250,6 +277,9 @@ UIFILES = \ ChangesUi.ui \ CharacterUi.ui \ CitationUi.ui \ + ColorUi.ui \ + CompareUi.ui \ + CompareHistoryUi.ui \ DelimiterUi.ui \ DocumentUi.ui \ ErrorListUi.ui \ @@ -257,7 +287,6 @@ UIFILES = \ ExternalUi.ui \ FindAndReplaceUi.ui \ FloatPlacementUi.ui \ - FloatUi.ui \ FontUi.ui \ GraphicsUi.ui \ HSpaceUi.ui \ @@ -266,12 +295,17 @@ UIFILES = \ 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 \ @@ -287,7 +321,8 @@ UIFILES = \ PrefColorsUi.ui \ PrefCompletionUi.ui \ PrefConvertersUi.ui \ - PrefDateUi.ui \ + PrefDocHandlingUi.ui \ + PrefOutputUi.ui \ PrefDisplayUi.ui \ PrefEditUi.ui \ PrefFileformatsUi.ui \ @@ -296,16 +331,14 @@ UIFILES = \ 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 \ RefUi.ui \ SearchUi.ui \ SendtoUi.ui \ @@ -324,14 +357,15 @@ UIFILES = \ 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) @@ -345,9 +379,6 @@ liblyxqt4_a_SOURCES = \ $(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/%)