QDialogButtonBox for the remaining dialogs.

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index e3f41bc12cd510bfbce0806abe439706ea82f72c..0768e6615a61028e94653999a92445893aec14d4 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>" >> $@
@@ -47,7 +48,8 @@ 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 \
@@ -60,6 +62,8 @@ SOURCEFILES = \
        CategorizedCombo.cpp \
        ColorCache.cpp \
        CustomizedWidgets.cpp \
+       DialogView.cpp \
+       DockView.cpp \
        EmptyTable.cpp \
        FancyLineEdit.cpp \
        FileDialog.cpp \
@@ -151,13 +155,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 \
@@ -177,6 +180,8 @@ MOCHEADER = \
        BulletsModule.h \
        CategorizedCombo.h \
        CustomizedWidgets.h \
+       DialogView.h \
+       DockView.h \
        EmptyTable.h \
        FancyLineEdit.h \
        FindAndReplace.h \
@@ -256,6 +261,7 @@ MOCHEADER = \
        PanelStack.h \
        TocModel.h \
        TocWidget.h \
+       ToolTipFormatter.h \
        Validator.h
 
 UIFILES = \
@@ -350,17 +356,18 @@ UIFILES = \
        ToggleWarningUi.ui \
        ViewSourceUi.ui \
        VSpaceUi.ui \
+       WorkAreaUi.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_QT
 
+nodist_liblyxqt4_a_SOURCES += liblyxqt4.cpp
 liblyxqt4_a_SOURCES = \
-       liblyxqt4.cpp \
        $(MOCHEADER) \
        $(NOMOCHEADER)