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 da3753fde18adb63d91ea0a6755bfb6a224443a8..555814197b9c88715bcad1c5fed95a27d61f270c 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -1,36 +1,23 @@
 include $(top_srcdir)/config/common.am
 include $(srcdir)/../Makefile.dialogs
 
-DISTCLEANFILES += $(MOCDIALOGS)
+DISTCLEANFILES += *.C
 
-noinst_LTLIBRARIES = libqt2moc.la
-
-INCLUDES = -I$(top_srcdir)/src/ \
-       -I$(top_srcdir)/src/frontends/ \
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
+       $(PCH_FLAGS) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/frontends \
        -I$(top_srcdir)/src/frontends/controllers \
        -I$(top_builddir)/src/frontends/qt2 \
-       $(SIGC_CFLAGS) \
-       $(FRONTEND_INCLUDES) \
+       $(QT_INCLUDES) \
        $(BOOST_INCLUDES)
 
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+noinst_LTLIBRARIES = libqt2moc.la
 
-nodist_libqt2moc_la_SOURCES = \
-       $(MOCDIALOGS) \
-       FileDialog_private_moc.C \
-       emptytable_moc.C \
-       lengthcombo_moc.C \
-       qttableview_moc.C \
-       Toolbar_pimpl_moc.C \
-       QCommandBuffer_moc.C \
-       QCommandEdit_moc.C \
-       QContentPane_moc.C \
-       Qt2Base_moc.C \
-       QtView_moc.C \
-       io_callback_moc.C \
-       $(MOCDIALOGS)
+nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
+# The trick.
+libqt2moc_la_LINK = touch libqt2moc.la ; echo
 
-libqt2moc.la: $(libqt2moc_la_OBJECTS) $(libqt2moc_la_DEPENDENCIES)
- 
-%_moc.C: ../%.h
+%_moc.C: $(srcdir)/../%.h
        $(MOC) -o $@ $<