Move the setting of the Qt preprocessor flags out of the Makefiles and into qt.m4

[features.git] / src / frontends / qt2 / Makefile.am

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 40772237db1925e0c93dfadd755dd84c24e0d247..36298be8cae6b9744d3a0c0d471f7b0bbc6bfe73 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -5,23 +5,25 @@ SUBDIRS = ui moc
 
 EXTRA_DIST = Makefile.dialogs
 
-INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
-       -I$(top_srcdir)/images \
-       $(QT_INCLUDES) $(BOOST_INCLUDES) \
-       -I$(top_srcdir)/src/frontends/controllers
-
 noinst_LTLIBRARIES = libqt2.la
 
 libqt2_la_LDFLAGS = $(QT_LDFLAGS)
 libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
+
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) \
+       $(PCH_FLAGS) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/frontends \
+       -I$(top_srcdir)/images \
+       $(QT_INCLUDES) $(BOOST_INCLUDES) \
+       -I$(top_srcdir)/src/frontends/controllers
 
 libqt2_la_SOURCES = \
        QDialogView.C \
        QDialogView.h \
        Alert_pimpl.C \
        Dialogs.C \
-       Dialogs2.C \
        FileDialog.C \
        LyXKeySymFactory.C \
        LyXScreenFactory.C \
@@ -30,6 +32,8 @@ libqt2_la_SOURCES = \
        QAbout.C QAbout.h \
        QBibitem.C QBibitem.h \
        QBibtex.C QBibtex.h \
+       QBox.C QBox.h \
+       QBranch.C QBranch.h \
        QChanges.C QChanges.h \
        QCharacter.C QCharacter.h \
        QCitation.C QCitation.h \
@@ -46,7 +50,6 @@ libqt2_la_SOURCES = \
        QLPainter.C QLPainter.h \
        QLyXKeySym.C QLyXKeySym.h \
        QMath.C QMath.h \
-       QMinipage.C QMinipage.h \
        QNote.C QNote.h \
        QParagraph.C QParagraph.h \
        QPrefs.C QPrefs.h \
@@ -62,12 +65,13 @@ libqt2_la_SOURCES = \
        QThesaurus.C QThesaurus.h \
        QToc.C QToc.h \
        QURL.C QURL.h \
-       QVCLog.C QVCLog.h \
+       QVSpace.C QVSpace.h \
        QWorkArea.h QWorkArea.C \
        QWrap.C QWrap.h \
        Qt2BC.C Qt2BC.h \
        QtLyXView.h \
        WorkAreaFactory.C \
+       checkedwidgets.C checkedwidgets.h \
        lyx_gui.C \
        lcolorcache.h lcolorcache.C \
        panelstack.h panelstack.C \