Move the lib out of gst-libs

24 files changed, 36 insertions, 36 deletions

diff --git a/transmitters/multicast/Makefile.am b/transmitters/multicast/Makefile.am
index 6aaea167..6a0776c2 100644
--- a/transmitters/multicast/Makefile.am
+++ b/transmitters/multicast/Makefile.am
@@ -16,7 +16,7 @@ libmulticast_transmitter_la_CFLAGS = \
 	$(GST_CFLAGS)
 libmulticast_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
 libmulticast_transmitter_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \
+	$(top_builddir)/farstream/libfarstream-0.10.la \
 	$(FS_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.c b/transmitters/multicast/fs-multicast-stream-transmitter.c
index 76ac4742..a5b1844d 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.c
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.c
@@ -60,8 +60,8 @@
 #include "fs-multicast-stream-transmitter.h"
 #include "fs-multicast-transmitter.h"
 
-#include <gst/farstream/fs-candidate.h>
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-candidate.h>
+#include <farstream/fs-conference.h>
 
 #include <gst/gst.h>
 
diff --git a/transmitters/multicast/fs-multicast-stream-transmitter.h b/transmitters/multicast/fs-multicast-stream-transmitter.h
index 87f2dd92..e63db885 100644
--- a/transmitters/multicast/fs-multicast-stream-transmitter.h
+++ b/transmitters/multicast/fs-multicast-stream-transmitter.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gst/farstream/fs-stream-transmitter.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-stream-transmitter.h>
+#include <farstream/fs-plugin.h>
 #include "fs-multicast-transmitter.h"
 
 G_BEGIN_DECLS
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index ae3fcb2c..a0b82225 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -37,8 +37,8 @@
 #include "fs-multicast-transmitter.h"
 #include "fs-multicast-stream-transmitter.h"
 
-#include <gst/farstream/fs-conference.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-conference.h>
+#include <farstream/fs-plugin.h>
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/transmitters/multicast/fs-multicast-transmitter.h b/transmitters/multicast/fs-multicast-transmitter.h
index 07c359cc..400b5251 100644
--- a/transmitters/multicast/fs-multicast-transmitter.h
+++ b/transmitters/multicast/fs-multicast-transmitter.h
@@ -25,7 +25,7 @@
 #ifndef __FS_MULTICAST_TRANSMITTER_H__
 #define __FS_MULTICAST_TRANSMITTER_H__
 
-#include <gst/farstream/fs-transmitter.h>
+#include <farstream/fs-transmitter.h>
 
 #include <gst/gst.h>
 
diff --git a/transmitters/nice/Makefile.am b/transmitters/nice/Makefile.am
index 4660fc3d..91a58c56 100644
--- a/transmitters/nice/Makefile.am
+++ b/transmitters/nice/Makefile.am
@@ -18,7 +18,7 @@ libnice_transmitter_la_CFLAGS = \
 	$(NICE_CFLAGS)
 libnice_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
 libnice_transmitter_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \
+	$(top_builddir)/farstream/libfarstream-0.10.la \
 	$(FS_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS) \
diff --git a/transmitters/nice/fs-nice-agent.c b/transmitters/nice/fs-nice-agent.c
index 1e1e2c69..adcf5037 100644
--- a/transmitters/nice/fs-nice-agent.c
+++ b/transmitters/nice/fs-nice-agent.c
@@ -32,7 +32,7 @@
 #include "config.h"
 #endif
 
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-conference.h>
 
 #include "fs-nice-transmitter.h"
 #include "fs-nice-agent.h"
diff --git a/transmitters/nice/fs-nice-agent.h b/transmitters/nice/fs-nice-agent.h
index 6e634103..37db75d4 100644
--- a/transmitters/nice/fs-nice-agent.h
+++ b/transmitters/nice/fs-nice-agent.h
@@ -26,7 +26,7 @@
 #define __FS_NICE_AGENT_H__
 
 #include <glib-object.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-plugin.h>
 
 
 G_BEGIN_DECLS
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index 0e7782e0..1f0dbefc 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -38,7 +38,7 @@
 #include "fs-nice-transmitter.h"
 #include "fs-nice-agent.h"
 
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-conference.h>
 
 #include <gst/gst.h>
 
diff --git a/transmitters/nice/fs-nice-stream-transmitter.h b/transmitters/nice/fs-nice-stream-transmitter.h
index b40e02ee..2bc14e36 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.h
+++ b/transmitters/nice/fs-nice-stream-transmitter.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gst/farstream/fs-stream-transmitter.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-stream-transmitter.h>
+#include <farstream/fs-plugin.h>
 #include "fs-nice-transmitter.h"
 
 G_BEGIN_DECLS
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index 48773e19..64d8f183 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -39,8 +39,8 @@
 #include "fs-nice-stream-transmitter.h"
 #include "fs-nice-agent.h"
 
-#include <gst/farstream/fs-conference.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-conference.h>
+#include <farstream/fs-plugin.h>
 
 #include <agent.h>
 
diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h
index a39ae610..e4cbe898 100644
--- a/transmitters/nice/fs-nice-transmitter.h
+++ b/transmitters/nice/fs-nice-transmitter.h
@@ -25,7 +25,7 @@
 #ifndef __FS_NICE_TRANSMITTER_H__
 #define __FS_NICE_TRANSMITTER_H__
 
-#include <gst/farstream/fs-transmitter.h>
+#include <farstream/fs-transmitter.h>
 
 #include <gst/gst.h>
 #include <agent.h>
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 0038d6d3..fd5bd66e 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -24,7 +24,7 @@ librawudp_transmitter_la_CFLAGS = \
 	$(GUPNP_CFLAGS)
 librawudp_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
 librawudp_transmitter_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \
+	$(top_builddir)/farstream/libfarstream-0.10.la \
 	$(FS_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 9e28199a..27f6c8a3 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -37,7 +37,7 @@
 #include <nice/address.h>
 #include <nice/interfaces.h>
 
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-conference.h>
 
 #include <gst/netbuffer/gstnetbuffer.h>
 
diff --git a/transmitters/rawudp/fs-rawudp-component.h b/transmitters/rawudp/fs-rawudp-component.h
index 317eb4b8..5f124a7c 100644
--- a/transmitters/rawudp/fs-rawudp-component.h
+++ b/transmitters/rawudp/fs-rawudp-component.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gst/farstream/fs-stream-transmitter.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-stream-transmitter.h>
+#include <farstream/fs-plugin.h>
 #include "fs-rawudp-transmitter.h"
 
 G_BEGIN_DECLS
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 5d2f0d0f..99554dcd 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -66,8 +66,8 @@
 
 #include "fs-rawudp-component.h"
 
-#include <gst/farstream/fs-candidate.h>
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-candidate.h>
+#include <farstream/fs-conference.h>
 
 #ifdef HAVE_GUPNP
 #include <libgupnp-igd/gupnp-simple-igd-thread.h>
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.h b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
index 8e0698b0..a4d9b85c 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gst/farstream/fs-stream-transmitter.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-stream-transmitter.h>
+#include <farstream/fs-plugin.h>
 #include "fs-rawudp-transmitter.h"
 
 G_BEGIN_DECLS
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 111e7392..36961e38 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -37,8 +37,8 @@
 #include "fs-rawudp-transmitter.h"
 #include "fs-rawudp-stream-transmitter.h"
 
-#include <gst/farstream/fs-conference.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-conference.h>
+#include <farstream/fs-plugin.h>
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.h b/transmitters/rawudp/fs-rawudp-transmitter.h
index 723bd06a..c5c18de1 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.h
+++ b/transmitters/rawudp/fs-rawudp-transmitter.h
@@ -25,7 +25,7 @@
 #ifndef __FS_RAWUDP_TRANSMITTER_H__
 #define __FS_RAWUDP_TRANSMITTER_H__
 
-#include <gst/farstream/fs-transmitter.h>
+#include <farstream/fs-transmitter.h>
 
 #include <gst/netbuffer/gstnetbuffer.h>
 
diff --git a/transmitters/shm/Makefile.am b/transmitters/shm/Makefile.am
index f0a9bf92..07e1656b 100644
--- a/transmitters/shm/Makefile.am
+++ b/transmitters/shm/Makefile.am
@@ -16,7 +16,7 @@ libshm_transmitter_la_CFLAGS = \
 	$(GST_CFLAGS)
 libshm_transmitter_la_LDFLAGS = $(FS_PLUGIN_LDFLAGS)
 libshm_transmitter_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/farstream/libfarstream-0.10.la \
+	$(top_builddir)/farstream/libfarstream-0.10.la \
 	$(FS_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index 8ef3d742..23c45f26 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -66,8 +66,8 @@
 #include "fs-shm-stream-transmitter.h"
 #include "fs-shm-transmitter.h"
 
-#include <gst/farstream/fs-candidate.h>
-#include <gst/farstream/fs-conference.h>
+#include <farstream/fs-candidate.h>
+#include <farstream/fs-conference.h>
 
 #include <gst/gst.h>
 
diff --git a/transmitters/shm/fs-shm-stream-transmitter.h b/transmitters/shm/fs-shm-stream-transmitter.h
index f44b3170..38b6b8ad 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.h
+++ b/transmitters/shm/fs-shm-stream-transmitter.h
@@ -28,8 +28,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gst/farstream/fs-stream-transmitter.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-stream-transmitter.h>
+#include <farstream/fs-plugin.h>
 #include "fs-shm-transmitter.h"
 
 G_BEGIN_DECLS
diff --git a/transmitters/shm/fs-shm-transmitter.c b/transmitters/shm/fs-shm-transmitter.c
index d1b15740..5bd049f6 100644
--- a/transmitters/shm/fs-shm-transmitter.c
+++ b/transmitters/shm/fs-shm-transmitter.c
@@ -37,8 +37,8 @@
 #include "fs-shm-transmitter.h"
 #include "fs-shm-stream-transmitter.h"
 
-#include <gst/farstream/fs-conference.h>
-#include <gst/farstream/fs-plugin.h>
+#include <farstream/fs-conference.h>
+#include <farstream/fs-plugin.h>
 
 #include <string.h>
 
diff --git a/transmitters/shm/fs-shm-transmitter.h b/transmitters/shm/fs-shm-transmitter.h
index e483068c..978c3049 100644
--- a/transmitters/shm/fs-shm-transmitter.h
+++ b/transmitters/shm/fs-shm-transmitter.h
@@ -25,7 +25,7 @@
 #ifndef __FS_SHM_TRANSMITTER_H__
 #define __FS_SHM_TRANSMITTER_H__
 
-#include <gst/farstream/fs-transmitter.h>
+#include <farstream/fs-transmitter.h>
 
 #include <gst/gst.h>