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

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

diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index f3d039a0894be219a4ca0569987fe4c4f5d1fa93..555814197b9c88715bcad1c5fed95a27d61f270c 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -3,10 +3,11 @@ include $(srcdir)/../Makefile.dialogs
 
 DISTCLEANFILES += *.C
 
-AM_CPPFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_TRANSLATION \
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
        $(PCH_FLAGS) \
-       -I$(top_srcdir)/src/ \
-       -I$(top_srcdir)/src/frontends/ \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/src/frontends/controllers \
        -I$(top_builddir)/src/frontends/qt2 \
        $(QT_INCLUDES) \
@@ -16,7 +17,7 @@ noinst_LTLIBRARIES = libqt2moc.la
 
 nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
 # The trick.
-libqt2moc_la_LINK = touch libqt2moc.la
+libqt2moc_la_LINK = touch libqt2moc.la ; echo
 
 %_moc.C: $(srcdir)/../%.h
        $(MOC) -o $@ $<