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 dcfac58b8f0b1742dcd7d4131157c75dfbdb9d2c..36298be8cae6b9744d3a0c0d471f7b0bbc6bfe73 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -5,18 +5,19 @@ 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_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
-AM_CXXFLAGS = $(PCH_FLAGS)
+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 \