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 733f18778d726ea59a57a8ee2993be57fcfbe351..36298be8cae6b9744d3a0c0d471f7b0bbc6bfe73 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -1,88 +1,85 @@
 include $(top_srcdir)/config/common.am
+include $(srcdir)/Makefile.dialogs
 
 SUBDIRS = ui moc
 
-EXTRA_DIST = Makefile.dialogs QDocument.C QDocument.h \
-       QDocumentDialog.C QDocumentDialog.h
+EXTRA_DIST = Makefile.dialogs
 
 noinst_LTLIBRARIES = libqt2.la
 
-INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
+libqt2_la_LDFLAGS = $(QT_LDFLAGS)
+libqt2_la_LIBADD = $(QT_LIB) ui/*.lo moc/*.lo ui/moc/*.lo
+
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) \
+       $(PCH_FLAGS) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/images \
-       $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
+       $(QT_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-
-include $(srcdir)/Makefile.dialogs
-
 libqt2_la_SOURCES = \
+       QDialogView.C \
+       QDialogView.h \
        Alert_pimpl.C \
-       qgridview.h \
-       qgridview.cpp \
-       bulletstrings.h \
-       bulletstrings.C \
-       BulletsModule.C \
-       BulletsModule.h \
-       QBrowseBox.C \
-       QBrowseBox.h \
        Dialogs.C \
-       Dialogs2.C \
-       Dialogs_impl.h \
        FileDialog.C \
-       FileDialog_private.C \
        LyXKeySymFactory.C \
        LyXScreenFactory.C \
-       Menubar_pimpl.C \
-       Menubar_pimpl.h \
-       Timeout_pimpl.C \
-       Timeout_pimpl.h \
-       Toolbar_pimpl.C \
-       Toolbar_pimpl.h \
-       QCommandBuffer.C \
-       QCommandBuffer.h \
-       QCommandEdit.C \
-       QCommandEdit.h \
-       QContentPane.C \
-       QContentPane.h \
-       QLImage.C \
-       QLImage.h \
-       QLPainter.C \
-       QLPainter.h \
-       QLPopupMenu.C \
-       QLPopupMenu.h \
-       QLyXKeySym.C \
-       QLyXKeySym.h \
-       Qt2Base.C \
-       Qt2Base.h \
-       Qt2BC.C \
-       Qt2BC.h \
-       QtView.h \
-       QtView.C \
-       QWorkArea.h \
-       QWorkArea.C \
+       QLMenubar.C QLMenubar.h \
+       qtTimeout.C qtTimeout.h \
+       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 \
+       QDocument.C QDocument.h \
+       QErrorList.C QErrorList.h \
+       QERT.C QERT.h \
+       QExternal.C QExternal.h \
+       QFloat.C QFloat.h \
+       QGraphics.C QGraphics.h \
+       QInclude.C QInclude.h \
+       QIndex.C QIndex.h \
+       QLImage.C QLImage.h \
+       QLog.C QLog.h \
+       QLPainter.C QLPainter.h \
+       QLyXKeySym.C QLyXKeySym.h \
+       QMath.C QMath.h \
+       QNote.C QNote.h \
+       QParagraph.C QParagraph.h \
+       QPrefs.C QPrefs.h \
+       QPrint.C QPrint.h \
+       QRef.C QRef.h \
+       QSearch.C QSearch.h \
+       QSendto.C QSendto.h \
+       QShowFile.C QShowFile.h \
+       QSpellchecker.C QSpellchecker.h \
+       QTabular.C QTabular.h \
+       QTabularCreate.C QTabularCreate.h \
+       QTexinfo.C QTexinfo.h \
+       QThesaurus.C QThesaurus.h \
+       QToc.C QToc.h \
+       QURL.C QURL.h \
+       QVSpace.C QVSpace.h \
+       QWorkArea.h QWorkArea.C \
+       QWrap.C QWrap.h \
+       Qt2BC.C Qt2BC.h \
+       QtLyXView.h \
        WorkAreaFactory.C \
-       emptytable.C \
-       emptytable.h \
-       iconpalette.h \
-       iconpalette.C \
-       io_callback.h \
-       io_callback.C \
-       lengthcombo.C \
-       lengthcombo.h \
+       checkedwidgets.C checkedwidgets.h \
        lyx_gui.C \
-       qcoloritem.h \
-       qcoloritem.C \
-       qfont_loader.h \
-       qfont_loader.C \
+       lcolorcache.h lcolorcache.C \
+       panelstack.h panelstack.C \
+       qcoloritem.h qcoloritem.C \
+       qfontexample.h qfontexample.C \
+       qfont_loader.h qfont_loader.C \
        qfont_metrics.C \
        qlkey.h \
-       qscreen.h \
-       qscreen.C \
-       qsetborder.h \
-       qsetborder.C \
-       qttableview.h \
-       qttableview.C \
-       $(DIALOGSOURCES)
-
-libqt2.la: $(libqt2_la_OBJECTS) $(libqt2_la_DEPENDENCIES)
+       qscreen.h qscreen.C \
+       qt_helpers.h qt_helpers.C \
+       $(MOCFILES)