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

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

diff --git a/src/frontends/qt2/ui/moc/Makefile.am b/src/frontends/qt2/ui/moc/Makefile.am
index a19f0a5424ae5726b0abf1ad59a71e8736283c29..1cac7d84bf3f9b5dc04655b712546981379d1954 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -3,19 +3,20 @@ include $(srcdir)/../../Makefile.dialogs
 
 DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
 
-INCLUDES = -I$(top_srcdir)/src \
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
+       $(PCH_FLAGS) \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/src/frontends/controllers \
-       $(FRONTEND_INCLUDES) \
+       $(QT_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION
-
 noinst_LTLIBRARIES = libqt2uimoc.la
 
 nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
 # The trick.
-libqt2uimoc_la_LINK = touch libqt2uimoc.la
+libqt2uimoc_la_LINK = touch libqt2uimoc.la ; echo
 
 %_moc.C: ../%.h
        $(MOC) -o $@ $<