Rename the lib/ dir to telepathy-farsight/

20080721233333-3e2dc-69e77fef7f97ad2c5d217769dbd86dae5bff531d.gz

18 files changed, 14 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 5aa5f11..36d72fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = tools lib api src test doc data
+SUBDIRS = tools telepathy-farsight api src test doc data
 
 confdir = $(sysconfdir)/xdg/stream-engine
 
diff --git a/configure.ac b/configure.ac
index e6845f7..5460dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,7 @@ AC_OUTPUT( Makefile \
           data/Makefile \
           doc/Makefile \
 	  doc/lib/Makefile \
-          lib/Makefile  \
+          telepathy-farsight/Makefile  \
           src/Makefile  \
           test/Makefile \
           test/python/Makefile \
diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am
index 1389bbb..cce69e6 100644
--- a/doc/lib/Makefile.am
+++ b/doc/lib/Makefile.am
@@ -20,7 +20,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../lib
+DOC_SOURCE_DIR=../../telepathy-farsight
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -44,8 +44,8 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/lib/channel.h $(top_srcdir)/lib/stream.h
-CFILE_GLOB=$(top_srcdir)/lib/channel.c $(top_srcdir)/lib/stream.c
+HFILE_GLOB=$(top_srcdir)/telepathy-farsight/channel.h $(top_srcdir)/telepathy-farsight/stream.h
+CFILE_GLOB=$(top_srcdir)/telepathy-farsight/channel.c $(top_srcdir)/telepathy-farsight/stream.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -77,7 +77,7 @@ INCLUDES= \
 	$(GST_INTERFACES_CFLAGS) \
 	$(FARSIGHT2_CFLAGS) \
 	$(TELEPATHY_CFLAGS) \
-	-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/lib
+	-I$(top_srcdir) -I$(top_builddir)
 GTKDOC_LIBS= \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
@@ -86,7 +86,7 @@ GTKDOC_LIBS= \
 	$(GST_INTERFACES_LIBS) \
 	$(TELEPATHY_LIBS) \
 	$(FARSIGHT2_LIBS) \
-	$(top_builddir)/lib/libstreamengine.la
+	$(top_builddir)/telepathy-farsight/libstreamengine.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/Makefile.am b/src/Makefile.am
index 979d232..e28e103 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,8 +34,7 @@ AM_CFLAGS = \
 	$(FARSIGHT2_CFLAGS) \
 	$(TELEPATHY_CFLAGS) \
 	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/lib
+	-I$(top_builddir)
 
 AM_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -46,7 +45,7 @@ AM_LDFLAGS = \
 	$(TELEPATHY_LIBS) \
 	$(FARSIGHT2_LIBS) \
 	$(top_builddir)/api/libstream-engine-api.la \
-	$(top_builddir)/lib/libstreamengine.la
+	$(top_builddir)/telepathy-farsight/libstreamengine.la
 
 # rules to generate signal marshallers
 %-signals-marshal.h: %-signals-marshal.list Makefile.in
diff --git a/src/audiostream.h b/src/audiostream.h
index 3354ebb..ff00828 100644
--- a/src/audiostream.h
+++ b/src/audiostream.h
@@ -5,7 +5,7 @@
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/media-interfaces.h>
 
-#include "stream.h"
+#include <telepathy-farsight/stream.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
index 669db3f..6e60691 100644
--- a/src/tp-stream-engine.c
+++ b/src/tp-stream-engine.c
@@ -37,9 +37,10 @@
 
 #include <gst/farsight/fs-element-added-notifier.h>
 
+#include <telepathy-farsight/channel.h>
+#include <telepathy-farsight/stream.h>
+
 #include "api/api.h"
-#include "channel.h"
-#include "stream.h"
 #include "audiostream.h"
 #include "videosink.h"
 #include "videostream.h"
diff --git a/src/videostream.h b/src/videostream.h
index aa99c0c..6a48730 100644
--- a/src/videostream.h
+++ b/src/videostream.h
@@ -3,7 +3,7 @@
 
 #include <glib-object.h>
 
-#include "stream.h"
+#include <telepathy-farsight/stream.h>
 
 #include "videosink.h"
 
diff --git a/lib/.git-darcs-dir b/telepathy-farsight/.git-darcs-dir
index e69de29..e69de29 100644
--- a/lib/.git-darcs-dir
+++ b/telepathy-farsight/.git-darcs-dir
diff --git a/lib/Makefile.am b/telepathy-farsight/Makefile.am
index 4a09f71..4a09f71 100644
--- a/lib/Makefile.am
+++ b/telepathy-farsight/Makefile.am
diff --git a/lib/channel.c b/telepathy-farsight/channel.c
index caaf7f1..caaf7f1 100644
--- a/lib/channel.c
+++ b/telepathy-farsight/channel.c
diff --git a/lib/channel.h b/telepathy-farsight/channel.h
index e3146f5..e3146f5 100644
--- a/lib/channel.h
+++ b/telepathy-farsight/channel.h
diff --git a/lib/session-priv.h b/telepathy-farsight/session-priv.h
index 1a4153d..1a4153d 100644
--- a/lib/session-priv.h
+++ b/telepathy-farsight/session-priv.h
diff --git a/lib/session.c b/telepathy-farsight/session.c
index 81cbcc8..81cbcc8 100644
--- a/lib/session.c
+++ b/telepathy-farsight/session.c
diff --git a/lib/session.h b/telepathy-farsight/session.h
index b887447..b887447 100644
--- a/lib/session.h
+++ b/telepathy-farsight/session.h
diff --git a/lib/stream-priv.h b/telepathy-farsight/stream-priv.h
index 9fb0840..9fb0840 100644
--- a/lib/stream-priv.h
+++ b/telepathy-farsight/stream-priv.h
diff --git a/lib/stream.c b/telepathy-farsight/stream.c
index b2ba95f..b2ba95f 100644
--- a/lib/stream.c
+++ b/telepathy-farsight/stream.c
diff --git a/lib/stream.h b/telepathy-farsight/stream.h
index 8fc1e66..8fc1e66 100644
--- a/lib/stream.h
+++ b/telepathy-farsight/stream.h
diff --git a/lib/tpmedia-signals-marshal.list b/telepathy-farsight/tpmedia-signals-marshal.list
index 7d5dbc7..7d5dbc7 100644
--- a/lib/tpmedia-signals-marshal.list
+++ b/telepathy-farsight/tpmedia-signals-marshal.list