librenderer: Move code into its own directory

diff --git a/configure.ac b/configure.ac
index 4f1f510..e229a11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -207,6 +207,7 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 src/librygel-core/Makefile
+src/librygel-renderer/Makefile
 src/rygel/Makefile
 src/ui/Makefile
 src/plugins/Makefile

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 51cb4b0..b049310 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,11 +1,11 @@
 include ../common.am
 
 AM_CFLAGS += \
-       -I$(top_builddir)/src/plugins/playbin \
+       -I$(top_builddir)/src/librygel-renderer \
        -I$(top_builddir)/src/rygel
 
 noinst_PROGRAMS = standalone-renderer
 standalone_renderer_SOURCES = standalone-renderer.c
 standalone_renderer_LDADD = \
-       $(top_builddir)/src/plugins/playbin/librygel-renderer-1.0.la \
+       $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
        $(RYGEL_COMMON_LIBS)

diff --git a/src/Makefile.am b/src/Makefile.am
index a92a6d3..4c8c773 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 if BUILD_UI
-SUBDIRS = librygel-core rygel ui plugins
+SUBDIRS = librygel-core librygel-renderer rygel ui plugins
 else
-SUBDIRS = librygel-core rygel plugins
+SUBDIRS = librygel-core librygel-renderer rygel plugins
 endif
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
new file mode 100644 (file)
index 0000000..b227d59
--- /dev/null
+++ b/src/librygel-renderer/Makefile.am
@@ -0,0 +1,18 @@
+include ../../common.am
+
+lib_LTLIBRARIES = librygel-renderer-1.0.la
+
+LIBRYGEL_RENDERER_VERSION=0:0:0
+
+librygel_renderer_1_0_la_SOURCES = \
+       rygel-playbin-player.vala \
+       rygel-playbin-plugin.vala \
+       rygel-playbin-renderer.vala
+
+librygel_renderer_1_0_la_VALAFLAGS = \
+       -H rygel-renderer.h --library=rygel-renderer-1.0 \
+       $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+librygel_renderer_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS)
+librygel_renderer_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_VERSION)
+
+rygel-renderer.h rygel-renderer-1.0.vapi: librygel_renderer_1_0_la_vala.stamp

diff --git a/src/plugins/playbin/rygel-playbin-player.vala b/src/librygel-renderer/rygel-playbin-player.vala
similarity index 100%
rename from src/plugins/playbin/rygel-playbin-player.vala
rename to src/librygel-renderer/rygel-playbin-player.vala

diff --git a/src/plugins/playbin/rygel-playbin-plugin.vala b/src/librygel-renderer/rygel-playbin-plugin.vala
similarity index 99%
rename from src/plugins/playbin/rygel-playbin-plugin.vala
rename to src/librygel-renderer/rygel-playbin-plugin.vala
index 3557284..caac9ce 100644 (file)
--- a/src/plugins/playbin/rygel-playbin-plugin.vala
+++ b/src/librygel-renderer/rygel-playbin-plugin.vala
@@ -38,4 +38,3 @@ public class Rygel.Playbin.Plugin : Rygel.MediaRendererPlugin {
         return Playbin.Player.get_default ();
     }
 }
-

diff --git a/src/plugins/playbin/rygel-playbin-renderer.vala b/src/librygel-renderer/rygel-playbin-renderer.vala
similarity index 100%
rename from src/plugins/playbin/rygel-playbin-renderer.vala
rename to src/librygel-renderer/rygel-playbin-renderer.vala

diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 9aae44c..91cf9b8 100644 (file)
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -1,26 +1,16 @@
 include ../../../common.am
 
-lib_LTLIBRARIES = librygel-renderer-1.0.la
-
-LIBRYGEL_RENDERER_VERSION=0:0:0
-
-librygel_renderer_1_0_la_SOURCES = \
-       rygel-playbin-player.vala \
-       rygel-playbin-plugin.vala \
-       rygel-playbin-renderer.vala
-
-librygel_renderer_1_0_la_VALAFLAGS = \
-       -H rygel-renderer.h --library=rygel-renderer-1.0 \
-       $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_renderer_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS)
-librygel_renderer_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_VERSION)
+plugin_LTLIBRARIES = librygel-playbin.la
 
-rygel-renderer.h rygel-renderer-1.0.vapi: librygel_renderer_1_0_la_vala.stamp
+librygel_playbin_la_SOURCES = rygel-module.vala \
+                              $(top_builddir)/src/librygel-renderer/rygel-renderer-1.0.vapi
 
-plugin_LTLIBRARIES = librygel-playbin.la
+librygel_playbin_la_CFLAGS = $(AM_CFLAGS) \
+                             -I$(top_srcdir)/src/librygel-renderer \
+                             -DG_LOG_DOMAIN='"Playbin"'
 
-librygel_playbin_la_SOURCES = rygel-module.vala rygel-renderer-1.0.vapi
-librygel_playbin_la_CFLAGS = $(AM_CFLAGS) -DG_LOG_DOMAIN='"Playbin"'
 librygel_playbin_la_VALAFLAGS = $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LIBS) librygel-renderer-1.0.la
+librygel_playbin_la_LIBADD = $(RYGEL_COMMON_LIBS) \
+                             $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la
+
 librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)