projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0577e06
)
Merge branch 'master' into 0.11
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 12:08:29 +0000
(14:08 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Mon, 10 Oct 2011 12:08:29 +0000
(14:08 +0200)
tests/examples/cairo/Makefile.am
patch
|
blob
|
history
diff --git
a/tests/examples/cairo/Makefile.am
b/tests/examples/cairo/Makefile.am
index
45f5468
..
3a5eb58
100644
(file)
--- a/
tests/examples/cairo/Makefile.am
+++ b/
tests/examples/cairo/Makefile.am
@@
-4,4
+4,4
@@
endif
cairo_overlay_SOURCES = cairo_overlay.c
cairo_overlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(CAIRO_CFLAGS)
-cairo_overlay_LDADD = -lgstvideo-$(GST_MAJORMINOR) $(GST_LIBS) $(CAIRO_LIBS)
+cairo_overlay_LDADD =
$(GST_PLUGINS_BASE_LIBS)
-lgstvideo-$(GST_MAJORMINOR) $(GST_LIBS) $(CAIRO_LIBS)