From de90be9586bdab941c4174a8a3fa74bd480d2555 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 7 Mar 2012 12:34:48 +0000 Subject: [PATCH] build: Remove maintainer flags from test build Part of the test infrastructure relies on relaxed build conditions, so there's no point to enforce the anal retentive maintainer flags. --- tests/conform/Makefile.am | 2 +- tests/interactive/Makefile.am | 2 +- tests/performance/Makefile.am | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 1b0f9ea..5d5cf3b 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -155,7 +155,7 @@ test_conformance_CPPFLAGS = \ -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" -test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) +test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) test_conformance_LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 9536300..e56ef11 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -147,7 +147,7 @@ common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la noinst_PROGRAMS = test-interactive test_interactive_SOURCES = test-main.c test-unit-names.h $(UNIT_TESTS) -test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) +test_interactive_CFLAGS = $(CLUTTER_CFLAGS) test_interactive_CPPFLAGS = \ -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \ -DG_DISABLE_SINGLE_INCLUDES \ diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am index eb2b8b7..2c3f455 100644 --- a/tests/performance/Makefile.am +++ b/tests/performance/Makefile.am @@ -20,7 +20,6 @@ LDADD = $(common_ldadd) $(CLUTTER_LIBS) -lm AM_CFLAGS = \ $(CLUTTER_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ -DG_DISABLE_SINGLE_INCLUDES \ -DGLIB_DISABLE_DEPRECATION_WARNINGS \ -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \ -- 2.7.4