Add missing initialization

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

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index fc42e9b9d6e0b2b079350f59e344aefcd6601263..66a86bb227f695c2c7077be66f3ff49b987877e9 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -4,34 +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
-       $(AM_V_GEN)$(UIC4) $(UIC4FLAGS) $< -o $@
+       $(AM_V_GEN)$(QT_UIC) $(UICFLAGS) $< -o $@
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-QT_VERSION = $(shell IFS=.; set -- `echo $(QT4_VERSION)`; \
+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
-       $(AM_V_GEN)$(MOC4) -DQT_VERSION=$(QT_VERSION) -o $@ $<
+       $(AM_V_GEN)$(QT_MOC) -DQT_VERSION=$(QT_VERSION) -o $@ $<
 
 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' \
                | sed -e 's:$(top_srcdir)/lib/\(.*\):<file alias="\1">&</file>:' \
                >> $@ ;\
        echo "</qresource></RCC>" >> $@
 
 Resources.cpp: Resources.qrc
-       $(AM_V_GEN)$(RCC4) $< -name Resources -o $@
+       $(AM_V_GEN)$(QT_RCC) $< -name Resources -o $@
 
 
 #########################  LIBRARIES  #############################
@@ -41,26 +41,28 @@ 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 \
@@ -113,7 +115,6 @@ SOURCEFILES = \
        GuiParagraph.cpp \
        GuiPhantom.cpp \
        GuiPrefs.cpp \
-       GuiPrint.cpp \
        GuiPrintindex.cpp \
        GuiPrintNomencl.cpp \
        GuiProgress.cpp \
@@ -153,13 +154,12 @@ SOURCEFILES = \
        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 \
@@ -179,6 +179,8 @@ MOCHEADER = \
        BulletsModule.h \
        CategorizedCombo.h \
        CustomizedWidgets.h \
+       DialogView.h \
+       DockView.h \
        EmptyTable.h \
        FancyLineEdit.h \
        FindAndReplace.h \
@@ -222,7 +224,6 @@ MOCHEADER = \
        GuiParagraph.h \
        GuiPhantom.h \
        GuiPrefs.h \
-       GuiPrint.h \
        GuiPrintindex.h \
        GuiPrintNomencl.h \
        GuiProgress.h \
@@ -259,6 +260,7 @@ MOCHEADER = \
        PanelStack.h \
        TocModel.h \
        TocWidget.h \
+       ToolTipFormatter.h \
        Validator.h
 
 UIFILES = \
@@ -329,13 +331,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 \
@@ -357,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)
 
@@ -378,9 +379,6 @@ liblyxqt4_a_SOURCES = \
        $(MOCHEADER) \
        $(NOMOCHEADER)
 
-EXTRA_DIST = pch.h $(UIFILES:%=ui/%)
-BUILT_SOURCES += $(PCH_FILE)
-AM_CPPFLAGS += $(PCH_FLAGS)
-
-
 endif
+
+EXTRA_DIST = CMakeLists.txt $(UIFILES:%=ui/%)