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 4f1b3e2bc95fa824b7302efd50705331aa7cdb14..555814197b9c88715bcad1c5fed95a27d61f270c 100644 (file)
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -1,26 +1,23 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2moc.la
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${top_srcdir}/src/ \
-       -I${top_srcdir}/src/frontends/ \
-       -I${top_srcdir}/src/frontends/controllers \
-       ${SIGC_CFLAGS} \
-       ${FRONTEND_INCLUDES} \
+include $(top_srcdir)/config/common.am
+include $(srcdir)/../Makefile.dialogs
+
+DISTCLEANFILES += *.C
+
+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 \
+       $(QT_INCLUDES) \
        $(BOOST_INCLUDES)
 
-include ../Makefile.dialogs
- 
-libqt2moc_la_SOURCES := FileDialog_private_moc.C \
-       emptytable_moc.C \
-       Qt2Base_moc.C \
-       $(MOCDIALOGS)
-       #$(patsubst, %, %Dialog_moc.C, $(DIALOGS))
- 
-DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core
+noinst_LTLIBRARIES = libqt2moc.la
+
+nodist_libqt2moc_la_SOURCES = $(MOCFILES:.C=_moc.C)
+# The trick.
+libqt2moc_la_LINK = touch libqt2moc.la ; echo
 
-ETAGS_ARGS = --lang=c++
- 
-%_moc.C: ../%.h
+%_moc.C: $(srcdir)/../%.h
        $(MOC) -o $@ $<
-