If we are in a closeEvent, we don't want to close all buffers, because these may...

[lyx.git] / src / frontends / qt4 / Makefile.am

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 225dca655b81989df9fc14fe426695bdd27268c4..600046334ac9454b7d474bfa26e18704d8cd70bb 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -13,9 +13,9 @@ UIC4FLAGS=-tr lyx::qt_
 ui_%.h: ui/%.ui
        $(UIC4) $(UIC4FLAGS) $< -o $@
 
-MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-%_moc.cpp: %.h
+moc_%.cpp: %.h
        $(MOC4) -o $@ $<
 
 Resources.qrc: Makefile
@@ -31,14 +31,14 @@ Resources.cpp: Resources.qrc
 
 #########################  LIBRARIES  #############################
 
-noinst_LTLIBRARIES = liblyxqt4.la
+noinst_LIBRARIES = liblyxqt4.a
 
-liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
-liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-liblyxqt4_la_LIBADD = $(QT4_LIB) 
+liblyxqt4_a_DEPENDENCIES = $(MOCEDFILES)
 
 AM_CPPFLAGS += \
        $(QT4_CPPFLAGS) \
+       -DQT_NO_CAST_TO_ASCII \
+       -DQT_NO_STL \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/images \
@@ -57,6 +57,7 @@ SOURCEFILES = \
        CustomizedWidgets.cpp \
        EmptyTable.cpp \
        FileDialog.cpp \
+       FindAndReplace.cpp \
        FloatPlacement.cpp \
        GuiAbout.cpp \
        GuiAlert.cpp \
@@ -84,23 +85,28 @@ SOURCEFILES = \
        GuiFontLoader.cpp \
        GuiFontMetrics.cpp \
        GuiGraphics.cpp \
+       GuiHSpace.cpp \
        GuiHyperlink.cpp \
        GuiIdListModel.cpp \
        GuiImage.cpp \
        GuiInclude.cpp \
+       GuiIndex.cpp \
+       GuiIndices.cpp \
+       GuiInfo.cpp \
        GuiKeySymbol.cpp \
        GuiLabel.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
-       GuiMath.cpp \
        GuiMathMatrix.cpp \
        GuiNomencl.cpp \
        GuiNote.cpp \
        GuiPainter.cpp \
        GuiParagraph.cpp \
-       GuiPopupMenu.cpp \
+       GuiPhantom.cpp \
        GuiPrefs.cpp \
        GuiPrint.cpp \
+       GuiPrintindex.cpp \
+       GuiPrintNomencl.cpp \
        GuiRef.cpp \
        GuiSearch.cpp \
        GuiSelection.cpp \
@@ -116,7 +122,6 @@ SOURCEFILES = \
        GuiThesaurus.cpp \
        GuiToc.cpp \
        GuiToolbar.cpp \
-       GuiToolbars.cpp \
        GuiView.cpp \
        GuiViewSource.cpp \
        GuiVSpace.cpp \
@@ -127,11 +132,13 @@ SOURCEFILES = \
        LengthCombo.cpp \
        LyXFileDialog.cpp \
        LaTeXHighlighter.cpp \
+       LayoutBox.cpp \
        Menus.cpp \
        PanelStack.cpp \
        qt_helpers.cpp \
        TocModel.cpp \
        TocWidget.cpp \
+       Toolbars.cpp \
        Validator.cpp 
 
 NOMOCHEADER = \
@@ -146,18 +153,18 @@ NOMOCHEADER = \
        GuiIdListModel.h \
        GuiImage.h \
        GuiKeySymbol.h \
-       GuiMath.h \
        GuiPainter.h \
-       GuiToolbars.h \
        LaTeXHighlighter.h \
-       qlkey.h \
-       qt_helpers.h
+       qt_i18n.h \
+       qt_helpers.h \
+       Toolbars.h
 
 MOCHEADER = \
        Action.h \
        BulletsModule.h \
        CustomizedWidgets.h \
        EmptyTable.h \
+       FindAndReplace.h \
        FloatPlacement.h \
        GuiAbout.h \
        GuiApplication.h \
@@ -181,8 +188,12 @@ MOCHEADER = \
        GuiExternal.h \
        GuiFloat.h \
        GuiGraphics.h \
+       GuiHSpace.h \
        GuiHyperlink.h \
        GuiInclude.h \
+       GuiIndex.h \
+       GuiIndices.h \
+       GuiInfo.h \
        GuiLabel.h \
        GuiListings.h \
        GuiLog.h \
@@ -190,9 +201,11 @@ MOCHEADER = \
        GuiNomencl.h \
        GuiNote.h \
        GuiParagraph.h \
-       GuiPopupMenu.h \
+       GuiPhantom.h \
        GuiPrefs.h \
        GuiPrint.h \
+       GuiPrintindex.h \
+       GuiPrintNomencl.h \
        GuiRef.h \
        GuiSearch.h \
        GuiSelection.h \
@@ -215,6 +228,7 @@ MOCHEADER = \
        GuiWrap.h \
        IconPalette.h \
        InsertTableWidget.h \
+       LayoutBox.h \
        LengthCombo.h \
        LyXFileDialog.h \
        Menus.h \
@@ -232,6 +246,7 @@ UIFILES = \
        BibtexUi.ui \
        BoxUi.ui \
        BranchesUi.ui \
+       BranchesUnknownUi.ui \
        BranchUi.ui \
        BulletsUi.ui \
        ChangesUi.ui \
@@ -242,32 +257,42 @@ UIFILES = \
        ErrorListUi.ui \
        ERTUi.ui \
        ExternalUi.ui \
-       EmbeddedFilesUi.ui \
+       FindAndReplaceUi.ui \
        FloatPlacementUi.ui \
        FloatUi.ui \
        FontUi.ui \
        GraphicsUi.ui \
+       HSpaceUi.ui \
        HyperlinkUi.ui \
        IncludeUi.ui \
+       IndexUi.ui \
+       IndicesUi.ui \
+       InfoUi.ui \
        LabelUi.ui \
        LanguageUi.ui \
        LaTeXUi.ui \
        ListingsUi.ui \
+       ListingsSettingsUi.ui \
        LogUi.ui \
        MarginsUi.ui \
        MathMatrixUi.ui \
        MathsUi.ui \
+       ModulesUi.ui \
        NomenclUi.ui \
        NoteUi.ui \
        NumberingUi.ui \
+       OutputUi.ui \
        PageLayoutUi.ui \
        ParagraphUi.ui \
        PDFSupportUi.ui \
+       PhantomUi.ui \
        PreambleUi.ui \
        PrefColorsUi.ui \
+       PrefCompletionUi.ui \
        PrefConvertersUi.ui \
        PrefDateUi.ui \
        PrefDisplayUi.ui \
+       PrefEditUi.ui \
        PrefFileformatsUi.ui \
        PrefIdentityUi.ui \
        PrefInputUi.ui \
@@ -282,6 +307,8 @@ UIFILES = \
        PrefsUi.ui \
        PrefUi.ui \
        PrintUi.ui \
+       PrintindexUi.ui \
+       PrintNomenclUi.ui \
        RefUi.ui \
        SearchUi.ui \
        SendtoUi.ui \
@@ -295,18 +322,18 @@ UIFILES = \
        TextLayoutUi.ui \
        ThesaurusUi.ui \
        TocUi.ui \
+       ToggleWarningUi.ui \
        ViewSourceUi.ui \
        VSpaceUi.ui \
        WrapUi.ui
 
 
-if MONOLITHIC_FRONTEND_QT4
-
-
 liblyxqt4.cpp:
        @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
 
-liblyxqt4_la_SOURCES = \
+if MONOLITHIC_FRONTEND_QT4
+
+liblyxqt4_a_SOURCES = \
        liblyxqt4.cpp \
        $(MOCHEADER) \
        $(NOMOCHEADER)
@@ -316,15 +343,12 @@ CLEANFILES += liblyxqt4.cpp
 
 else
 
-liblyxqt4.cpp:
-       touch $@
-
-liblyxqt4_la_SOURCES = \
+liblyxqt4_a_SOURCES = \
        $(SOURCEFILES) \
        $(MOCHEADER) \
        $(NOMOCHEADER)
 
-EXTRA_DIST = pch.h
+EXTRA_DIST = pch.h ui/compile_uic.sh $(UIFILES:%=ui/%)
 BUILT_SOURCES += $(PCH_FILE)
 AM_CPPFLAGS += $(PCH_FLAGS)