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 afbd48adde6caac8ca45ed107d0a8b659de49119..36298be8cae6b9744d3a0c0d471f7b0bbc6bfe73 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -1,88 +1,85 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2.la
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-SUBDIRS=ui moc
-INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
-       ${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
-       -I$(top_srcdir)/src/frontends/controllers
-CXXFLAGS += -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+include $(top_srcdir)/config/common.am
+include $(srcdir)/Makefile.dialogs
 
-DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+SUBDIRS = ui moc
 
-include Makefile.dialogs
+EXTRA_DIST = Makefile.dialogs
 
-libqt2_la_DEPENDENCIES = ui/libqt2ui.la moc/libqt2moc.la ui/moc/libqt2uimoc.la
- 
-libqt2_la_OBJADD = \
-       ui/libqt2ui.la \
-       moc/libqt2moc.la \
-       ui/moc/libqt2uimoc.la \
-       ../controllers/ButtonControllerBase.lo \
-       ../xforms/combox.lo \
-       ../xforms/Color.lo \
-       ../xforms/FloatMenuImpl.lo \
-       ../xforms/FormBaseDeprecated.lo \
-       ../xforms/FormBibitem.lo \
-       ../xforms/FormBibtex.lo \
-       ../xforms/FormBrowser.lo \
-       ../xforms/FormDocument.lo \
-       ../xforms/FormError.lo \
-       ../xforms/FormExternal.lo \
-       ../xforms/FormGraphics.lo \
-       ../xforms/FormInclude.lo \
-       ../xforms/FormIndex.lo \
-       ../xforms/FormInset.lo \
-       ../xforms/FormLog.lo \
-       ../xforms/FormMinipage.lo \
-       ../xforms/FormPreamble.lo \
-       ../xforms/FormPreferences.lo \
-       ../xforms/FormRef.lo \
-       ../xforms/FormTabular.lo \
-       ../xforms/FormToc.lo \
-       ../xforms/FormUrl.lo \
-       ../xforms/FormVCLog.lo \
-       ../xforms/MathsSymbols.lo \
-       ../xforms/Menubar_pimpl.lo \
-       ../xforms/RadioButtonGroup.lo \
-       ../xforms/Timeout_pimpl.lo \
-       ../xforms/Toolbar_pimpl.lo \
-       ../xforms/bmtable.lo \
-       ../xforms/form_bibitem.lo \
-       ../xforms/form_bibtex.lo \
-       ../xforms/form_browser.lo \
-       ../xforms/form_document.lo \
-       ../xforms/form_error.lo \
-       ../xforms/form_external.lo \
-       ../xforms/form_index.lo \
-       ../xforms/form_graphics.lo \
-       ../xforms/form_include.lo \
-       ../xforms/form_index.lo \
-       ../xforms/form_minipage.lo \
-       ../xforms/form_preamble.lo \
-       ../xforms/form_preferences.lo \
-       ../xforms/form_ref.lo \
-       ../xforms/form_tabular.lo \
-       ../xforms/form_toc.lo \
-       ../xforms/form_url.lo \
-       ../xforms/input_validators.lo \
-       ../xforms/xformsBC.lo \
-       ../xforms/xforms_helpers.lo
+noinst_LTLIBRARIES = libqt2.la
 
-LIBS=
-LDFLAGS= $(libqt2_la_OBJADD)
-ETAGS_ARGS = --lang=c++
+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 \
+       $(QT_INCLUDES) $(BOOST_INCLUDES) \
+       -I$(top_srcdir)/src/frontends/controllers
 
 libqt2_la_SOURCES = \
-       $(DIALOGSOURCES) \
+       QDialogView.C \
+       QDialogView.h \
+       Alert_pimpl.C \
        Dialogs.C \
-       GUIRunTime.C \
        FileDialog.C \
-       FileDialog_private.C \
-       Qt2Base.C       \
-       Qt2Base.h       \
-       emptytable.C \
-       emptytable.h \
-       qt2BC.C \
-       qt2BC.h 
+       LyXKeySymFactory.C \
+       LyXScreenFactory.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 \
+       checkedwidgets.C checkedwidgets.h \
+       lyx_gui.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 \
+       qt_helpers.h qt_helpers.C \
+       $(MOCFILES)