summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2006-01-30 15:47:47 +0000
committerAndy Wingo <wingo@pobox.com>2006-01-30 15:47:47 +0000
commit518be9209939e7dda759ff2dfce8643cd2a585c7 (patch)
tree55286bac56e10a8758d83f2f9c12eb105e588000
parentf54198bd02bea27ae019bcf27eb309f107081991 (diff)
downloadgst-plugins-bad-518be9209939e7dda759ff2dfce8643cd2a585c7.tar.gz
gst-plugins-bad-518be9209939e7dda759ff2dfce8643cd2a585c7.tar.bz2
gst-plugins-bad-518be9209939e7dda759ff2dfce8643cd2a585c7.zip
sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD)
Original commit message from CVS: 2006-01-30 Andy Wingo <wingo@pobox.com> * sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD) (libgstglimagesink_la_CFLAGS): Add PLUGINS_BASE cflags and libs.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--sys/glsink/Makefile.am6
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 04132911..c04933c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-30 Andy Wingo <wingo@pobox.com>
+
+ * sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD)
+ (libgstglimagesink_la_CFLAGS): Add PLUGINS_BASE cflags and libs.
+
2006-01-29 Tim-Philipp Müller <tim at centricular dot net>
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_setcaps),
diff --git a/common b/common
-Subproject bc4325349e8d0ec90aa5c5e74566880cc2e8252
+Subproject 0b93085188e83fe678ec5ded2823cd7c24dfa84
diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am
index 88c3d0f7..408a64dd 100644
--- a/sys/glsink/Makefile.am
+++ b/sys/glsink/Makefile.am
@@ -2,8 +2,10 @@
plugin_LTLIBRARIES = libgstglimagesink.la
libgstglimagesink_la_SOURCES = glimagesink.c
-libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS)
+libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU \
- $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
+ $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)