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 c110dae70fe77b59c8eeeffff11d76a8a2b511b6..b09e2b9ff61d505a3b35699ce2cd1832f5a1978f 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -26,6 +26,7 @@ moc_%.cpp: %.h
 Resources.qrc: Makefile
        $(AM_V_GEN)echo "<!DOCTYPE RCC><RCC version='1.0'><qresource>" > $@ ; \
        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>" >> $@
@@ -79,6 +80,7 @@ SOURCEFILES = \
        GuiChanges.cpp \
        GuiCharacter.cpp \
        GuiCitation.cpp \
+       GuiClickableLabel.cpp \
        GuiClipboard.cpp \
        GuiCommandBuffer.cpp \
        GuiCommandEdit.cpp \
@@ -108,6 +110,7 @@ SOURCEFILES = \
        GuiLine.cpp \
        GuiListings.cpp \
        GuiLog.cpp \
+       GuiLyXFiles.cpp \
        GuiMathMatrix.cpp \
        GuiNomenclature.cpp \
        GuiNote.cpp \
@@ -155,7 +158,7 @@ SOURCEFILES = \
        TocWidget.cpp \
        Toolbars.cpp \
        ToolTipFormatter.cpp \
-       Validator.cpp 
+       Validator.cpp
 
 NOMOCHEADER = \
        ButtonController.h \
@@ -195,6 +198,7 @@ MOCHEADER = \
        GuiChanges.h \
        GuiCharacter.h \
        GuiCitation.h \
+       GuiClickableLabel.h \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \
@@ -218,6 +222,7 @@ MOCHEADER = \
        GuiLine.h \
        GuiListings.h \
        GuiLog.h \
+       GuiLyXFiles.h \
        GuiMathMatrix.h \
        GuiNomenclature.h \
        GuiNote.h \
@@ -267,7 +272,6 @@ UIFILES = \
        AboutUi.ui \
        BibitemUi.ui \
        BiblioUi.ui \
-       BibtexAddUi.ui \
        BibtexUi.ui \
        BoxUi.ui \
        BranchesUi.ui \
@@ -304,6 +308,7 @@ UIFILES = \
        ListingsSettingsUi.ui \
        LocalLayoutUi.ui \
        LogUi.ui \
+       LyXFilesUi.ui \
        MarginsUi.ui \
        MasterChildUi.ui \
        MathMatrixUi.ui \
@@ -360,26 +365,9 @@ UIFILES = \
 
 nodist_liblyxqt4_a_SOURCES = Resources.cpp
 
-liblyxqt4.cpp:
-       $(AM_V_GEN)for file in $(SOURCEFILES) ; do echo '#include "'$${file}'"' ; done >$@
-
-if MONOLITHIC_FRONTEND_QT
-
-nodist_liblyxqt4_a_SOURCES += liblyxqt4.cpp
-liblyxqt4_a_SOURCES = \
-       $(MOCHEADER) \
-       $(NOMOCHEADER)
-
-BUILT_SOURCES += liblyxqt4.cpp
-CLEANFILES += liblyxqt4.cpp
-
-else
-
 liblyxqt4_a_SOURCES = \
        $(SOURCEFILES) \
        $(MOCHEADER) \
        $(NOMOCHEADER)
 
-endif
-
 EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)