From f12caa5c2255493d42f5e5aa14b98a9b0a99a66b Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 2 Sep 2015 23:40:31 +1000 Subject: [PATCH] qt: don't use CPPFLAGS for tools that cannot use them For example moc will bail out when given arguments it does not know about. The moc specific MOC_CPPFLAGS can still be used to pass flags to moc. https://bugzilla.gnome.org/show_bug.cgi?id=754466 --- ext/qt/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/qt/Makefile.am b/ext/qt/Makefile.am index eb0b79dcab..053a83fdde 100644 --- a/ext/qt/Makefile.am +++ b/ext/qt/Makefile.am @@ -42,7 +42,7 @@ libgstqtsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) $(moc_generated): moc_%.cc: %.h - @MOC@ -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $< + @MOC@ -o $@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_CPPFLAGS) $< ui-%.h: %.ui @UIC@ -o $@ $<