mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
Theoretically we should also do this for all local libraries to make sure
we don't test with a 'stray' outside library.
This commit is contained in:
Edward Hervey 2009-11-05 21:09:28 +01:00
parent 2d177f9ee7
commit 70a08107fd
2 changed files with 8 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/check/Makefile.am
View file

@ -143,6 +143,7 @@ EXTRA_DIST = \
AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) AM_CFLAGS = $(GST_OBJ_CFLAGS) $(CHECK_CFLAGS)
LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \ LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
$(GST_OBJ_LIBS) \ $(GST_OBJ_LIBS) \
$(CHECK_LIBS) $(CHECK_LIBS)
@ -158,28 +159,6 @@ libs_gdp_LDADD = \
elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_srcdir)/configure.ac\" 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_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 = \ libs_controller_LDADD = \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
$(LDADD) $(LDADD)
@ -189,12 +168,6 @@ libs_gstnetclientclock_LDADD = \
libs_gstnettimeprovider_LDADD = \ libs_gstnettimeprovider_LDADD = \
$(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \
$(LDADD) $(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 # valgrind testing
# these just need valgrind fixing, period # these just need valgrind fixing, period
@ -267,7 +240,7 @@ coverage-report:
coverage/$$dir/index.xml > coverage/$$dir/index.html; \ coverage/$$dir/index.xml > coverage/$$dir/index.html; \
fi; \ fi; \
done done
for file in $(COVERAGE_FILES_REL); do \ for file in $(COVERAGE_FILES_REL); do \
echo Generating coverage/$$file.html; \ echo Generating coverage/$$file.html; \
perl $(top_srcdir)/common/coverage/coverage-report-entry.pl \ perl $(top_srcdir)/common/coverage/coverage-report-entry.pl \

8
tests/examples/manual/Makefile.am
View file

@ -10,7 +10,6 @@ else
GST_LOADSAVE_SRC = xml-mp3 GST_LOADSAVE_SRC = xml-mp3
endif endif
INCLUDES = $(GST_OBJ_CFLAGS)
# gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS) # gnome_LDADD = $(GST_OBJ_LIBS) $(LIBGNOMEUI_LIBS)
# gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS) # gnome_CFLAGS = $(GST_OBJ_CFLAGS) $(LIBGNOMEUI_CFLAGS)
@ -50,6 +49,12 @@ EXAMPLES = \
decodebin \ decodebin \
$(GST_LOADSAVE_SRC) $(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 elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c: $(top_srcdir)/docs/manual/basics-elements.xml
$(PERL_PATH) $(srcdir)/extract.pl $@ \ $(PERL_PATH) $(srcdir)/extract.pl $@ \
$(top_srcdir)/docs/manual/basics-elements.xml $(top_srcdir)/docs/manual/basics-elements.xml
@ -99,4 +104,3 @@ TESTS = bin \
ghostpad init ghostpad init
noinst_PROGRAMS = $(EXAMPLES) noinst_PROGRAMS = $(EXAMPLES)
LDADD = $(GST_OBJ_LIBS)