From edb114c4bc94ba340d85e22c844b6becf6bc1f09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 9 Aug 2013 20:10:35 +0100 Subject: [PATCH] tests: fix build of baseaudiovisualizer test with subdir-objects option https://bugzilla.gnome.org/show_bug.cgi?id=705350 --- tests/check/Makefile.am | 6 ++---- tests/check/elements/baseaudiovisualizer.c | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index fe13b67..b3f6d30 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -316,11 +316,9 @@ elements_voaacenc_LDADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ -lgstaudio-@GST_API_VERSION@ -elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c \ - $(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.c \ - $(top_srcdir)/gst/audiovisualizers/gstaudiovisualizer.h +elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c elements_baseaudiovisualizer_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ - -I$(top_srcdir)/gst/audiovisualizers $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_baseaudiovisualizer_LDADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ diff --git a/tests/check/elements/baseaudiovisualizer.c b/tests/check/elements/baseaudiovisualizer.c index 741b48b..f0fd93a 100644 --- a/tests/check/elements/baseaudiovisualizer.c +++ b/tests/check/elements/baseaudiovisualizer.c @@ -19,13 +19,12 @@ * Boston, MA 02110-1301, USA. */ -#include +#include "../../gst/audiovisualizers/gstaudiovisualizer.c" +#undef GST_CAT_DEFAULT -#include +#include #include -#include "gstaudiovisualizer.h" - /* dummy subclass for testing */ #define GST_TYPE_TEST_SCOPE (gst_test_scope_get_type()) -- 2.7.4