Commit graph

4 commits

Author SHA1 Message Date
Wim Taymans
0ac9bb7d99 Merge branch 'master' into 0.11
Conflicts:
	tests/examples/audio/Makefile.am
	tests/examples/v4l/Makefile.am
2011-06-10 12:14:57 +02:00
Christophe Fergeau
a9b979d45f examples: don't link testchannels example with system libgstaudio
The testchannels audio test program is using -lgstaudio-0.10 to link
with libgstaudio which won't use the gstaudio library that was just
built but the one from the system. This is an issue since it means
we won't be testing the code from the current source tree, and it
also breaks the build when building on a system which don't have
a libgstaudio yet.

https://bugzilla.gnome.org/show_bug.cgi?id=652100
2011-06-08 12:14:20 +01:00
Edward Hervey
ac582227c1 examples: Link against proper libgstaudio
It was previously attempting to link against the non-local one.
2011-06-03 19:28:32 +02:00
Stefan Kost
940291dd38 audio: move testchannels example to 'tests/examples' dir
Also fix it up a little to not include 'c' file but link to the libs instead.
2011-05-27 15:09:25 +03:00