Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5270ba46d189cbb5e01d0b82081cda2869fb922b..b09e2b9ff61d505a3b35699ce2cd1832f5a1978f 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -4,7 +4,7 @@ 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()
@@ -25,7 +25,8 @@ moc_%.cpp: %.h
 
 Resources.qrc: Makefile
        $(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
-       find $(top_srcdir)/lib/images -name '*.png' -o -name '*.gif' \
+       find $(top_srcdir)/lib/images -name '*.svgz' -o -name '*.png' -o -name '*.gif' \
+               | LC_ALL=C sort \
                | sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
                >> $@ ;\
        echo "</qresource></RCC>" >> $@
@@ -47,20 +48,22 @@ AM_CPPFLAGS += \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/images \
-       $(QT_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 \
@@ -77,6 +80,7 @@ SOURCEFILES = \
        GuiChanges.cpp \
        GuiCharacter.cpp \
        GuiCitation.cpp \
+       GuiClickableLabel.cpp \
        GuiClipboard.cpp \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
@@ -106,6 +110,7 @@ SOURCEFILES = \
        GuiLine.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
+       GuiLyXFiles.cpp \
        GuiMathMatrix.cpp \
        GuiNomenclature.cpp \
        GuiNote.cpp \
@@ -113,7 +118,6 @@ SOURCEFILES = \
        GuiParagraph.cpp \
        GuiPhantom.cpp \
        GuiPrefs.cpp \
-       GuiPrint.cpp \
        GuiPrintindex.cpp \
        GuiPrintNomencl.cpp \
        GuiProgress.cpp \
@@ -153,13 +157,12 @@ SOURCEFILES = \
        TocModel.cpp \
        TocWidget.cpp \
        Toolbars.cpp \
-       Validator.cpp 
+       ToolTipFormatter.cpp \
+       Validator.cpp
 
 NOMOCHEADER = \
        ButtonController.h \
        ColorCache.h \
-       DialogView.h \
-       DockView.h \
        FileDialog.h \
        GuiFontExample.h \
        GuiFontLoader.h \
@@ -179,6 +182,8 @@ MOCHEADER = \
        BulletsModule.h \
        CategorizedCombo.h \
        CustomizedWidgets.h \
+       DialogView.h \
+       DockView.h \
        EmptyTable.h \
        FancyLineEdit.h \
        FindAndReplace.h \
@@ -193,6 +198,7 @@ MOCHEADER = \
        GuiChanges.h \
        GuiCharacter.h \
        GuiCitation.h \
+       GuiClickableLabel.h \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
@@ -216,13 +222,13 @@ MOCHEADER = \
        GuiLine.h \
        GuiListings.h \
        GuiLog.h \
+       GuiLyXFiles.h \
        GuiMathMatrix.h \
        GuiNomenclature.h \
        GuiNote.h \
        GuiParagraph.h \
        GuiPhantom.h \
        GuiPrefs.h \
-       GuiPrint.h \
        GuiPrintindex.h \
        GuiPrintNomencl.h \
        GuiProgress.h \
@@ -259,13 +265,13 @@ MOCHEADER = \
        PanelStack.h \
        TocModel.h \
        TocWidget.h \
+       ToolTipFormatter.h \
        Validator.h
 
 UIFILES = \
        AboutUi.ui \
        BibitemUi.ui \
        BiblioUi.ui \
-       BibtexAddUi.ui \
        BibtexUi.ui \
        BoxUi.ui \
        BranchesUi.ui \
@@ -302,6 +308,7 @@ UIFILES = \
        ListingsSettingsUi.ui \
        LocalLayoutUi.ui \
        LogUi.ui \
+       LyXFilesUi.ui \
        MarginsUi.ui \
        MasterChildUi.ui \
        MathMatrixUi.ui \
@@ -329,13 +336,11 @@ UIFILES = \
        PrefLanguageUi.ui \
        PrefLatexUi.ui \
        PrefPathsUi.ui \
-       PrefPrinterUi.ui \
        PrefScreenFontsUi.ui \
        PrefShortcutsUi.ui \
        PrefSpellcheckerUi.ui \
        PrefsUi.ui \
        PrefUi.ui \
-       PrintUi.ui \
        PrintindexUi.ui \
        PrintNomenclUi.ui \
        ProgressViewUi.ui \
@@ -355,32 +360,14 @@ UIFILES = \
        ToggleWarningUi.ui \
        ViewSourceUi.ui \
        VSpaceUi.ui \
+       WorkAreaUi.ui \
        WrapUi.ui
 
-
-liblyxqt4.cpp:
-       @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
-
-if MONOLITHIC_FRONTEND_QT
-
-liblyxqt4_a_SOURCES = \
-       liblyxqt4.cpp \
-       $(MOCHEADER) \
-       $(NOMOCHEADER)
-
-BUILT_SOURCES += liblyxqt4.cpp
-CLEANFILES += liblyxqt4.cpp
-
-else
+nodist_liblyxqt4_a_SOURCES = Resources.cpp
 
 liblyxqt4_a_SOURCES = \
        $(SOURCEFILES) \
        $(MOCHEADER) \
        $(NOMOCHEADER)
 
-EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
-BUILT_SOURCES += $(PCH_FILE)
-AM_CPPFLAGS += $(PCH_FLAGS)
-
-
-endif
+EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)