tests: Make sure we use the local libgstbase and not a stray outside one.

Theoretically we should also do this for all local libraries to make sure
we don't test with a 'stray' outside library.

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 5e92d701985756c3034dc4f2a215d41534de1a82..ec3acbd0ccd0c5b2993009f106425dffdf8dd5b7 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -143,6 +143,7 @@ EXTRA_DIST = \
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
+       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
        $(GST_OBJ_LIBS) \
        $(CHECK_LIBS)
 
@@ -158,28 +159,6 @@ libs_gdp_LDADD = \
 elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
 elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\"
 
-elements_fakesink_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-
-libs_basesrc_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_bitreader_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_bytereader_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_bytewriter_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_adapter_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_collectpads_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
 libs_controller_LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
        $(LDADD)
@@ -189,12 +168,6 @@ libs_gstnetclientclock_LDADD = \
 libs_gstnettimeprovider_LDADD = \
        $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \
        $(LDADD)
-libs_typefindhelper_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
-libs_transform1_LDADD = \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
-       $(LDADD)
 
 # valgrind testing
 # these just need valgrind fixing, period
@@ -267,7 +240,7 @@ coverage-report:
              coverage/$$dir/index.xml > coverage/$$dir/index.html;     \
          fi; \
         done
-       
+
        for file in $(COVERAGE_FILES_REL); do                           \
          echo Generating coverage/$$file.html;                         \
          perl $(top_srcdir)/common/coverage/coverage-report-entry.pl   \

diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am
index 8d50c899802c2e06486ddc048e1d3a075a5e6d12..13baaf799c449b675023bfa1d2a13920b75ba422 100644 (file)
--- a/tests/examples/manual/Makefile.am
+++ b/tests/examples/manual/Makefile.am
@@ -10,7 +10,6 @@ else
 GST_LOADSAVE_SRC = xml-mp3
 endif
 
-INCLUDES = $(GST_OBJ_CFLAGS)
 
 # gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
 # gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
@@ -50,6 +49,12 @@ EXAMPLES = \
        decodebin \
        $(GST_LOADSAVE_SRC)
 
+AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
+LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
+       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+       $(GST_OBJ_LIBS) \
+       $(CHECK_LIBS)
+
 elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c: $(top_srcdir)/docs/manual/basics-elements.xml
        $(PERL_PATH) $(srcdir)/extract.pl $@ \
                $(top_srcdir)/docs/manual/basics-elements.xml
@@ -99,4 +104,3 @@ TESTS = bin \
        ghostpad init
 
 noinst_PROGRAMS = $(EXAMPLES)
-LDADD = $(GST_OBJ_LIBS)