From 518be9209939e7dda759ff2dfce8643cd2a585c7 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 30 Jan 2006 15:47:47 +0000 Subject: [PATCH] sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD) Original commit message from CVS: 2006-01-30 Andy Wingo * sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD) (libgstglimagesink_la_CFLAGS): Add PLUGINS_BASE cflags and libs. --- ChangeLog | 5 +++++ common | 2 +- sys/glsink/Makefile.am | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 041329118d..c04933c83b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-30 Andy Wingo + + * sys/glsink/Makefile.am (libgstglimagesink_la_LIBADD) + (libgstglimagesink_la_CFLAGS): Add PLUGINS_BASE cflags and libs. + 2006-01-29 Tim-Philipp Müller * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_setcaps), diff --git a/common b/common index bc4325349e..0b93085188 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527 +Subproject commit 0b93085188e83fe678ec5ded2823cd7c24dfa843 diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am index 88c3d0f7af..408a64dd9f 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)