From 01f2c2f7992b81c2a7578cd02fc88281c8fdb40a Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 29 Nov 2005 10:46:00 +0000
Subject: remove the videofilter library and link to the one in base

Original commit message from CVS:
remove the videofilter library and link to the one in base
---
 gst/effectv/Makefile.am     | 5 ++---
 gst/effectv/gstaging.c      | 2 +-
 gst/effectv/gstdice.c       | 2 +-
 gst/effectv/gstedge.c       | 2 +-
 gst/effectv/gstquark.c      | 2 +-
 gst/effectv/gstrev.c        | 2 +-
 gst/effectv/gstshagadelic.c | 2 +-
 gst/effectv/gstvertigo.c    | 2 +-
 gst/effectv/gstwarp.c       | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'gst/effectv')

diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index 2bdf7b77..40408492 100644
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -9,10 +9,9 @@ libgsteffectv_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	-I$(top_srcdir)/gst/videofilter
 libgsteffectv_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
+	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
 	$(GST_BASE_LIBS) \
-	$(GST_LIBS) \
-	$(top_builddir)/gst/videofilter/libgstvideofilter-@GST_MAJORMINOR@.la
+	$(GST_LIBS)
 libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gsteffectv.h
diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index 3d70fbb3..6bddf65d 100644
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <math.h>
diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 3d2376c5..12ce2ed9 100644
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -14,7 +14,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <gst/gst.h>
diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c
index 2ee53dbe..8a34480e 100644
--- a/gst/effectv/gstedge.c
+++ b/gst/effectv/gstedge.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index e8ef93e7..161eb809 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index 331d6b37..a1482e77 100644
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -44,7 +44,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index cedf9c92..6a39f723 100644
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index abe92a52..04df4310 100644
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 4cf4b548..190d0d58 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #endif
 
-#include <gstvideofilter.h>
+#include <gst/video/gstvideofilter.h>
 
 #include <string.h>
 #include <math.h>
-- 
cgit