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 da81104a44a09da94638650cf11b3db1726ea8cf..1cac7d84bf3f9b5dc04655b712546981379d1954 100644 (file)
--- a/src/frontends/qt2/ui/moc/Makefile.am
+++ b/src/frontends/qt2/ui/moc/Makefile.am
@@ -1,24 +1,22 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libqt2uimoc.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} \
-       $(BOOST_INCLUDES)
-AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
+include $(top_srcdir)/config/common.am
+include $(srcdir)/../../Makefile.dialogs
 
-include ../../Makefile.dialogs
+DISTCLEANFILES += $(UIFILES:.ui=_moc.C)
 
-libqt2uimoc_la_SOURCES := $(UIMOCDIALOGS)
-#      $(patsubst, %, %Dialog_moc.C, $(DIALOGS))
+AM_CPPFLAGS = \
+       $(QT_CPPFLAGS) -DQT_NO_TRANSLATION \
+       $(PCH_FLAGS) \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/frontends \
+       -I$(top_srcdir)/src/frontends/controllers \
+       $(QT_INCLUDES) \
+       $(BOOST_INCLUDES)
 
-DISTCLEANFILES = $(libqt2uimoc_la_SOURCES) *.orig *.rej *~ *.bak core
+noinst_LTLIBRARIES = libqt2uimoc.la
 
-ETAGS_ARGS = --lang=c++
+nodist_libqt2uimoc_la_SOURCES = $(UIFILES:.ui=_moc.C)
+# The trick.
+libqt2uimoc_la_LINK = touch libqt2uimoc.la ; echo
 
 %_moc.C: ../%.h
        $(MOC) -o $@ $<
-