core: Move library code into its own directory

123 files changed, 187 insertions, 194 deletions

diff --git a/autogen.sh b/autogen.sh
index c44511e0..8d46a7f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME git"
@@ -12,7 +12,7 @@ REQUIRED_AUTOMAKE_VERSION=1.11 \
 REQUIRED_AUTOCONF_VERSION=2.64 \
 REQUIRED_LIBTOOL_VERSION=2.2.6 \
 REQUIRED_INTLTOOL_VERSION=0.40.0 \
-gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
+bash gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
                  --enable-tests --enable-test-plugin \
                  --enable-mediathek-plugin --enable-gst-launch-plugin \
                  --enable-strict-valac "$@"
diff --git a/common.am b/common.am
index a3667b88..dbaf065e 100644
--- a/common.am
+++ b/common.am
@@ -18,6 +18,7 @@ smallicondir = $(shareddir)/icons/48x48
 bigicondir = $(shareddir)/icons/120x120
 
 rygeldir = $(top_srcdir)/src/rygel
+librygelcoredir = $(top_srcdir)/src/librygel-core
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -30,6 +31,7 @@ AM_CFLAGS = \
 	$(UUID_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-I$(rygeldir) \
+	-I$(librygelcoredir) \
 	-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
 	-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
 	-DPRESET_DIR='"$(presetdir)"'\
@@ -46,7 +48,7 @@ RYGEL_BASE_LIBS = \
 
 RYGEL_COMMON_LIBS = \
 	$(RYGEL_BASE_LIBS) \
-	$(top_builddir)/src/rygel/librygel-core-1.0.la
+	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
 
 # Note: the -g needs to be at the end of VALAFLAGS to not break make dist
 RYGEL_COMMON_PLUGIN_VALAFLAGS = \
@@ -56,6 +58,7 @@ RYGEL_COMMON_PLUGIN_VALAFLAGS = \
 RYGEL_COMMON_VALAFLAGS = \
 	--pkg rygel-build-config --pkg gupnp-1.0 \
 	--vapidir=$(rygeldir) \
+	--vapidir=$(librygelcoredir) \
 	--pkg gupnp-av-1.0 --pkg gee-1.0 \
 	$(RYGEL_DEBUG_VALAFLAGS) \
 	$(COVERAGE_VALAFLAGS)
diff --git a/configure.ac b/configure.ac
index 702f6a22..4f1f5108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Rygel],
 	[http://live.gnome.org/Rygel])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AC_CONFIG_SRCDIR([src/rygel/rygel-root-device.vala])
+AC_CONFIG_SRCDIR([src/librygel-core/rygel-root-device.vala])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -206,6 +206,7 @@ AM_CONDITIONAL([HAVE_XSLTPROC], [test x"$XSLTPROC" != x])
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/librygel-core/Makefile
 src/rygel/Makefile
 src/ui/Makefile
 src/plugins/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e6533a8..a92a6d38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 if BUILD_UI
-SUBDIRS = rygel ui plugins
+SUBDIRS = librygel-core rygel ui plugins
 else
-SUBDIRS = rygel plugins
+SUBDIRS = librygel-core rygel plugins
 endif
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
new file mode 100644
index 00000000..8060e7c2
--- /dev/null
+++ b/src/librygel-core/Makefile.am
@@ -0,0 +1,147 @@
+include ../../common.am
+
+AM_CFLAGS += \
+	$(LIBGUPNP_DLNA_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(LIBGSTREAMER_CFLAGS) \
+	$(GST_PBU_CFLAGS) \
+	-DSMALL_ICON_DIR='"$(smallicondir)"' \
+	-DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
+	-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
+
+librygelincdir = $(includedir)/rygel-1.0
+
+librygelinc_HEADERS = rygel-core.h
+
+lib_LTLIBRARIES = librygel-core-1.0.la
+
+VAPI_SOURCE_FILES = \
+	rygel-cmdline-config.vala \
+	rygel-root-device.vala \
+	rygel-root-device-factory.vala \
+	rygel-audio-item.vala \
+	rygel-dbus-interface.vala \
+	rygel-icon-info.vala \
+	rygel-image-item.vala \
+	rygel-log-handler.vala \
+	rygel-logical-expression.vala \
+	rygel-media-art-store.vala \
+	rygel-media-objects.vala \
+	rygel-media-renderer-plugin.vala \
+	rygel-meta-config.vala \
+	rygel-music-item.vala \
+	rygel-photo-item.vala \
+	rygel-plugin-loader.vala \
+	rygel-plugin.vala \
+	rygel-relational-expression.vala \
+	rygel-resource-info.vala \
+	rygel-simple-container.vala \
+	rygel-subtitle.vala \
+	rygel-thumbnail.vala \
+	rygel-user-config.vala \
+	rygel-video-item.vala \
+	rygel-media-container.vala \
+	rygel-media-item.vala \
+	rygel-media-object.vala \
+	rygel-media-server-plugin.vala \
+	rygel-search-expression.vala \
+	rygel-configuration.vala \
+	rygel-free-desktop-interfaces.vala \
+	rygel-media-player.vala \
+	rygel-searchable-container.vala \
+	rygel-state-machine.vala \
+	rygel-visual-item.vala \
+	rygel-writable-container.vala \
+	rygel-xml-utils.vala
+
+librygel_core_1_0_la_SOURCES = \
+	$(VAPI_SOURCE_FILES) \
+	rygel-http-item-uri.vala \
+	rygel-environment-config.vala \
+	rygel-content-directory.vala \
+	rygel-connection-manager.vala \
+	rygel-source-connection-manager.vala \
+	rygel-sink-connection-manager.vala \
+	rygel-av-transport.vala \
+	rygel-rendering-control.vala \
+	rygel-transcode-manager.vala \
+	rygel-http-server.vala \
+	rygel-http-request.vala \
+	rygel-http-get-handler.vala \
+	rygel-http-get.vala \
+	rygel-http-post.vala \
+	rygel-http-identity-handler.vala \
+	rygel-http-transcode-handler.vala \
+	rygel-http-seek.vala \
+	rygel-http-byte-seek.vala \
+	rygel-http-time-seek.vala \
+	rygel-http-response.vala \
+	rygel-http-gst-sink.vala \
+	rygel-thumbnailer.vala \
+	rygel-dbus-thumbnailer.vala \
+	rygel-subtitle-manager.vala \
+	rygel-media-query-action.vala \
+	rygel-browse.vala \
+	rygel-search.vala \
+	rygel-client-hacks.vala \
+	rygel-xbox-hacks.vala \
+	rygel-panasonic-hacks.vala \
+	rygel-xbmc-hacks.vala \
+	rygel-wmp-hacks.vala \
+	rygel-v1-hacks.vala \
+	rygel-import-resource.vala \
+	rygel-item-creator.vala \
+	rygel-item-destroyer.vala \
+	rygel-item-removal-queue.vala \
+	rygel-search-criteria-parser.vala \
+	rygel-transcoder.vala \
+	rygel-audio-transcoder.vala \
+	rygel-video-transcoder.vala \
+	rygel-mp2ts-transcoder.vala \
+	rygel-mp3-transcoder.vala \
+	rygel-l16-transcoder.vala \
+	rygel-wmv-transcoder.vala \
+	rygel-aac-transcoder.vala \
+	rygel-avc-transcoder.vala \
+	rygel-gst-utils.vala \
+	rygel-media-receiver-registrar.vala \
+	rygel-changelog.vala \
+	rygel-volume.vala \
+	rygel-description-file.vala
+
+librygel_core_1_0_la_VALAFLAGS = \
+	-H rygel-core.h -C --library=rygel-core-1.0 \
+	--pkg gstreamer-0.10 \
+	--pkg gstreamer-base-0.10 \
+	--pkg gupnp-dlna-1.0 \
+	$(RYGEL_COMMON_VALAFLAGS)
+
+librygel_core_1_0_la_LIBADD = \
+	$(GST_PBU_LIBS) \
+	$(RYGEL_BASE_LIBS) \
+	$(LIBGUPNP_DLNA_LIBS) \
+	$(GIO_LIBS) \
+	$(LIBSOUP_LIBS)
+
+RYGEL_CORE_VERSION=0:0:0
+librygel_core_1_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
+
+BUILT_SOURCES = \
+	rygel-core-1.0.vapi \
+	rygel-core.h
+
+VAPI_FILES = rygel-core-1.0.vapi
+DEPS_FILES = rygel-core-1.0.deps
+
+vapidir = $(VAPIDIR)
+vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
+rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
+
+MAINTAINERCLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+	rygel-build-config.vapi \
+	rygel-misc.vapi \
+	$(VAPI_FILES) \
+	$(DEPS_FILES) \
+	$(BUILT_SOURCES)
diff --git a/src/rygel/rygel-aac-transcoder.vala b/src/librygel-core/rygel-aac-transcoder.vala
index c92df8a0..c92df8a0 100644
--- a/src/rygel/rygel-aac-transcoder.vala
+++ b/src/librygel-core/rygel-aac-transcoder.vala
diff --git a/src/rygel/rygel-audio-item.vala b/src/librygel-core/rygel-audio-item.vala
index 04f87090..04f87090 100644
--- a/src/rygel/rygel-audio-item.vala
+++ b/src/librygel-core/rygel-audio-item.vala
diff --git a/src/rygel/rygel-audio-transcoder.vala b/src/librygel-core/rygel-audio-transcoder.vala
index 8ff88a45..8ff88a45 100644
--- a/src/rygel/rygel-audio-transcoder.vala
+++ b/src/librygel-core/rygel-audio-transcoder.vala
diff --git a/src/rygel/rygel-av-transport.vala b/src/librygel-core/rygel-av-transport.vala
index 5f346fe6..5f346fe6 100644
--- a/src/rygel/rygel-av-transport.vala
+++ b/src/librygel-core/rygel-av-transport.vala
diff --git a/src/rygel/rygel-avc-transcoder.vala b/src/librygel-core/rygel-avc-transcoder.vala
index d1a4e615..d1a4e615 100644
--- a/src/rygel/rygel-avc-transcoder.vala
+++ b/src/librygel-core/rygel-avc-transcoder.vala
diff --git a/src/rygel/rygel-browse.vala b/src/librygel-core/rygel-browse.vala
index 1e23eeba..b7c8af61 100644
--- a/src/rygel/rygel-browse.vala
+++ b/src/librygel-core/rygel-browse.vala
@@ -125,4 +125,3 @@ internal class Rygel.Browse: Rygel.MediaQueryAction {
         base.handle_error (error);
     }
 }
-
diff --git a/src/rygel/rygel-changelog.vala b/src/librygel-core/rygel-changelog.vala
index 602990e4..602990e4 100644
--- a/src/rygel/rygel-changelog.vala
+++ b/src/librygel-core/rygel-changelog.vala
diff --git a/src/rygel/rygel-client-hacks.vala b/src/librygel-core/rygel-client-hacks.vala
index 2f6f72ab..2f6f72ab 100644
--- a/src/rygel/rygel-client-hacks.vala
+++ b/src/librygel-core/rygel-client-hacks.vala
diff --git a/src/rygel/rygel-cmdline-config.vala b/src/librygel-core/rygel-cmdline-config.vala
index 7cd9f881..e71a47c0 100644
--- a/src/rygel/rygel-cmdline-config.vala
+++ b/src/librygel-core/rygel-cmdline-config.vala
@@ -450,4 +450,3 @@ public class Rygel.CmdlineConfig : GLib.Object, Configuration {
         }
     }
 }
-
diff --git a/src/rygel/rygel-configuration.vala b/src/librygel-core/rygel-configuration.vala
index ca112658..f37638df 100644
--- a/src/rygel/rygel-configuration.vala
+++ b/src/librygel-core/rygel-configuration.vala
@@ -90,4 +90,3 @@ public interface Rygel.Configuration : GLib.Object {
                                    string key)
                                    throws GLib.Error;
 }
-
diff --git a/src/rygel/rygel-connection-manager.vala b/src/librygel-core/rygel-connection-manager.vala
index bdec8079..bdec8079 100644
--- a/src/rygel/rygel-connection-manager.vala
+++ b/src/librygel-core/rygel-connection-manager.vala
diff --git a/src/rygel/rygel-content-directory.vala b/src/librygel-core/rygel-content-directory.vala
index 80da87d4..dea1b872 100644
--- a/src/rygel/rygel-content-directory.vala
+++ b/src/librygel-core/rygel-content-directory.vala
@@ -462,4 +462,3 @@ internal class Rygel.ContentDirectory: Service {
         return ret;
     }
 }
-
diff --git a/src/rygel/rygel-core-1.0.deps b/src/librygel-core/rygel-core-1.0.deps
index 080d2af7..080d2af7 100644
--- a/src/rygel/rygel-core-1.0.deps
+++ b/src/librygel-core/rygel-core-1.0.deps
diff --git a/src/rygel/rygel-dbus-interface.vala b/src/librygel-core/rygel-dbus-interface.vala
index 1cbed1e9..1fb9d7c8 100644
--- a/src/rygel/rygel-dbus-interface.vala
+++ b/src/librygel-core/rygel-dbus-interface.vala
@@ -28,4 +28,3 @@ public interface Rygel.DBusInterface : Object {
 
     public abstract void shutdown () throws IOError;
 }
-
diff --git a/src/rygel/rygel-dbus-thumbnailer.vala b/src/librygel-core/rygel-dbus-thumbnailer.vala
index 0de15efc..0de15efc 100644
--- a/src/rygel/rygel-dbus-thumbnailer.vala
+++ b/src/librygel-core/rygel-dbus-thumbnailer.vala
diff --git a/src/rygel/rygel-description-file.vala b/src/librygel-core/rygel-description-file.vala
index ee3e3305..ee3e3305 100644
--- a/src/rygel/rygel-description-file.vala
+++ b/src/librygel-core/rygel-description-file.vala
diff --git a/src/rygel/rygel-environment-config.vala b/src/librygel-core/rygel-environment-config.vala
index c2c8bffa..35d991b9 100644
--- a/src/rygel/rygel-environment-config.vala
+++ b/src/librygel-core/rygel-environment-config.vala
@@ -214,4 +214,3 @@ internal class Rygel.EnvironmentConfig : GLib.Object, Configuration {
         return true;
     }
 }
-
diff --git a/src/rygel/rygel-free-desktop-interfaces.vala b/src/librygel-core/rygel-free-desktop-interfaces.vala
index 6c2e843d..e6100f26 100644
--- a/src/rygel/rygel-free-desktop-interfaces.vala
+++ b/src/librygel-core/rygel-free-desktop-interfaces.vala
@@ -53,4 +53,3 @@ public interface FreeDesktop.Properties: Object {
     public abstract async HashTable<string,Variant> get_all (string iface)
                                                              throws DBusError;
 }
-
diff --git a/src/rygel/rygel-gst-utils.vala b/src/librygel-core/rygel-gst-utils.vala
index 3d42b4db..3d42b4db 100644
--- a/src/rygel/rygel-gst-utils.vala
+++ b/src/librygel-core/rygel-gst-utils.vala
diff --git a/src/rygel/rygel-http-byte-seek.vala b/src/librygel-core/rygel-http-byte-seek.vala
index 556ef754..556ef754 100644
--- a/src/rygel/rygel-http-byte-seek.vala
+++ b/src/librygel-core/rygel-http-byte-seek.vala
diff --git a/src/rygel/rygel-http-get-handler.vala b/src/librygel-core/rygel-http-get-handler.vala
index 243fa7c6..243fa7c6 100644
--- a/src/rygel/rygel-http-get-handler.vala
+++ b/src/librygel-core/rygel-http-get-handler.vala
diff --git a/src/rygel/rygel-http-get.vala b/src/librygel-core/rygel-http-get.vala
index c98d56c6..8d464c60 100644
--- a/src/rygel/rygel-http-get.vala
+++ b/src/librygel-core/rygel-http-get.vala
@@ -217,4 +217,3 @@ internal class Rygel.HTTPGet : HTTPRequest {
         }
     }
 }
-
diff --git a/src/rygel/rygel-http-gst-sink.vala b/src/librygel-core/rygel-http-gst-sink.vala
index 17cebce9..67a3271e 100644
--- a/src/rygel/rygel-http-gst-sink.vala
+++ b/src/librygel-core/rygel-http-gst-sink.vala
@@ -128,4 +128,3 @@ internal class Rygel.HTTPGstSink : BaseSink {
         this.response.msg.wrote_chunk.disconnect (this.on_wrote_chunk);
     }
 }
-
diff --git a/src/rygel/rygel-http-identity-handler.vala b/src/librygel-core/rygel-http-identity-handler.vala
index 845fe323..845fe323 100644
--- a/src/rygel/rygel-http-identity-handler.vala
+++ b/src/librygel-core/rygel-http-identity-handler.vala
diff --git a/src/rygel/rygel-http-item-uri.vala b/src/librygel-core/rygel-http-item-uri.vala
index 9f8fa4c2..9f8fa4c2 100644
--- a/src/rygel/rygel-http-item-uri.vala
+++ b/src/librygel-core/rygel-http-item-uri.vala
diff --git a/src/rygel/rygel-http-post.vala b/src/librygel-core/rygel-http-post.vala
index d47b5ddd..54756ee7 100644
--- a/src/rygel/rygel-http-post.vala
+++ b/src/librygel-core/rygel-http-post.vala
@@ -226,4 +226,3 @@ internal class Rygel.HTTPPost : HTTPRequest {
     }
 
 }
-
diff --git a/src/rygel/rygel-http-request.vala b/src/librygel-core/rygel-http-request.vala
index 348bc292..92d3c109 100644
--- a/src/rygel/rygel-http-request.vala
+++ b/src/librygel-core/rygel-http-request.vala
@@ -115,4 +115,3 @@ internal abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
         this.completed ();
     }
 }
-
diff --git a/src/rygel/rygel-http-response.vala b/src/librygel-core/rygel-http-response.vala
index bbcf6550..bbcf6550 100644
--- a/src/rygel/rygel-http-response.vala
+++ b/src/librygel-core/rygel-http-response.vala
diff --git a/src/rygel/rygel-http-seek.vala b/src/librygel-core/rygel-http-seek.vala
index a8577349..a8577349 100644
--- a/src/rygel/rygel-http-seek.vala
+++ b/src/librygel-core/rygel-http-seek.vala
diff --git a/src/rygel/rygel-http-server.vala b/src/librygel-core/rygel-http-server.vala
index bbfa0834..c4c67ff1 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/librygel-core/rygel-http-server.vala
@@ -192,4 +192,3 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
         request.run.begin ();
     }
 }
-
diff --git a/src/rygel/rygel-http-time-seek.vala b/src/librygel-core/rygel-http-time-seek.vala
index 85979776..85979776 100644
--- a/src/rygel/rygel-http-time-seek.vala
+++ b/src/librygel-core/rygel-http-time-seek.vala
diff --git a/src/rygel/rygel-http-transcode-handler.vala b/src/librygel-core/rygel-http-transcode-handler.vala
index 18ab87ab..b4746e70 100644
--- a/src/rygel/rygel-http-transcode-handler.vala
+++ b/src/librygel-core/rygel-http-transcode-handler.vala
@@ -74,4 +74,3 @@ internal class Rygel.HTTPTranscodeHandler : HTTPGetHandler {
                                              request.http_server);
     }
 }
-
diff --git a/src/rygel/rygel-icon-info.vala b/src/librygel-core/rygel-icon-info.vala
index f76aef10..1823185e 100644
--- a/src/rygel/rygel-icon-info.vala
+++ b/src/librygel-core/rygel-icon-info.vala
@@ -39,4 +39,3 @@ public class Rygel.IconInfo {
         this.file_extension = file_extension;
     }
 }
-
diff --git a/src/rygel/rygel-image-item.vala b/src/librygel-core/rygel-image-item.vala
index c1972ff2..c1972ff2 100644
--- a/src/rygel/rygel-image-item.vala
+++ b/src/librygel-core/rygel-image-item.vala
diff --git a/src/rygel/rygel-import-resource.vala b/src/librygel-core/rygel-import-resource.vala
index dd28a709..1653fdb8 100644
--- a/src/rygel/rygel-import-resource.vala
+++ b/src/librygel-core/rygel-import-resource.vala
@@ -276,4 +276,3 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
         this.run_callback ();
     }
 }
-
diff --git a/src/rygel/rygel-item-creator.vala b/src/librygel-core/rygel-item-creator.vala
index 4caec904..836a9760 100644
--- a/src/rygel/rygel-item-creator.vala
+++ b/src/librygel-core/rygel-item-creator.vala
@@ -615,4 +615,3 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine {
         return valid;
     }
 }
-
diff --git a/src/rygel/rygel-item-destroyer.vala b/src/librygel-core/rygel-item-destroyer.vala
index e6dc6c4b..90203cb2 100644
--- a/src/rygel/rygel-item-destroyer.vala
+++ b/src/librygel-core/rygel-item-destroyer.vala
@@ -112,4 +112,3 @@ internal class Rygel.ItemDestroyer: GLib.Object, Rygel.StateMachine {
         return media_object;
     }
 }
-
diff --git a/src/rygel/rygel-item-removal-queue.vala b/src/librygel-core/rygel-item-removal-queue.vala
index a2a63315..540fa008 100644
--- a/src/rygel/rygel-item-removal-queue.vala
+++ b/src/librygel-core/rygel-item-removal-queue.vala
@@ -83,4 +83,3 @@ internal class Rygel.ItemRemovalQueue: GLib.Object {
         item_timeouts = new HashMap<string,uint> ();
     }
 }
-
diff --git a/src/rygel/rygel-l16-transcoder.vala b/src/librygel-core/rygel-l16-transcoder.vala
index 54516f5f..54516f5f 100644
--- a/src/rygel/rygel-l16-transcoder.vala
+++ b/src/librygel-core/rygel-l16-transcoder.vala
diff --git a/src/rygel/rygel-log-handler.vala b/src/librygel-core/rygel-log-handler.vala
index b4ccd4a7..b4ccd4a7 100644
--- a/src/rygel/rygel-log-handler.vala
+++ b/src/librygel-core/rygel-log-handler.vala
diff --git a/src/rygel/rygel-logical-expression.vala b/src/librygel-core/rygel-logical-expression.vala
index dbf64921..dbf64921 100644
--- a/src/rygel/rygel-logical-expression.vala
+++ b/src/librygel-core/rygel-logical-expression.vala
diff --git a/src/rygel/rygel-media-art-store.vala b/src/librygel-core/rygel-media-art-store.vala
index 7ba0487a..7ba0487a 100644
--- a/src/rygel/rygel-media-art-store.vala
+++ b/src/librygel-core/rygel-media-art-store.vala
diff --git a/src/rygel/rygel-media-container.vala b/src/librygel-core/rygel-media-container.vala
index 0cc5c44c..a361abeb 100644
--- a/src/rygel/rygel-media-container.vala
+++ b/src/librygel-core/rygel-media-container.vala
@@ -195,4 +195,3 @@ public abstract class Rygel.MediaContainer : MediaObject {
         }
     }
 }
-
diff --git a/src/rygel/rygel-media-item.vala b/src/librygel-core/rygel-media-item.vala
index 2e0584ed..2e0584ed 100644
--- a/src/rygel/rygel-media-item.vala
+++ b/src/librygel-core/rygel-media-item.vala
diff --git a/src/rygel/rygel-media-object.vala b/src/librygel-core/rygel-media-object.vala
index b5ffcfea..b5ffcfea 100644
--- a/src/rygel/rygel-media-object.vala
+++ b/src/librygel-core/rygel-media-object.vala
diff --git a/src/rygel/rygel-media-objects.vala b/src/librygel-core/rygel-media-objects.vala
index e91316c3..e91316c3 100644
--- a/src/rygel/rygel-media-objects.vala
+++ b/src/librygel-core/rygel-media-objects.vala
diff --git a/src/rygel/rygel-media-player.vala b/src/librygel-core/rygel-media-player.vala
index c139cfb8..c139cfb8 100644
--- a/src/rygel/rygel-media-player.vala
+++ b/src/librygel-core/rygel-media-player.vala
diff --git a/src/rygel/rygel-media-query-action.vala b/src/librygel-core/rygel-media-query-action.vala
index 24b1acfe..24b1acfe 100644
--- a/src/rygel/rygel-media-query-action.vala
+++ b/src/librygel-core/rygel-media-query-action.vala
diff --git a/src/rygel/rygel-media-receiver-registrar.vala b/src/librygel-core/rygel-media-receiver-registrar.vala
index cc007fce..cc007fce 100644
--- a/src/rygel/rygel-media-receiver-registrar.vala
+++ b/src/librygel-core/rygel-media-receiver-registrar.vala
diff --git a/src/rygel/rygel-media-renderer-plugin.vala b/src/librygel-core/rygel-media-renderer-plugin.vala
index 09180004..549d95bf 100644
--- a/src/rygel/rygel-media-renderer-plugin.vala
+++ b/src/librygel-core/rygel-media-renderer-plugin.vala
@@ -54,4 +54,3 @@ public class Rygel.MediaRendererPlugin : Rygel.Plugin {
         return null;
     }
 }
-
diff --git a/src/rygel/rygel-media-server-plugin.vala b/src/librygel-core/rygel-media-server-plugin.vala
index 0961eb54..13293aed 100644
--- a/src/rygel/rygel-media-server-plugin.vala
+++ b/src/librygel-core/rygel-media-server-plugin.vala
@@ -83,4 +83,3 @@ public abstract class Rygel.MediaServerPlugin : Rygel.Plugin {
         this.active = true;
     }
 }
-
diff --git a/src/rygel/rygel-meta-config.vala b/src/librygel-core/rygel-meta-config.vala
index 869755a1..5a755389 100644
--- a/src/rygel/rygel-meta-config.vala
+++ b/src/librygel-core/rygel-meta-config.vala
@@ -544,4 +544,3 @@ public class Rygel.MetaConfig : GLib.Object, Configuration {
         return val;
     }
 }
-
diff --git a/src/rygel/rygel-mp2ts-transcoder.vala b/src/librygel-core/rygel-mp2ts-transcoder.vala
index b3ffd70b..b3ffd70b 100644
--- a/src/rygel/rygel-mp2ts-transcoder.vala
+++ b/src/librygel-core/rygel-mp2ts-transcoder.vala
diff --git a/src/rygel/rygel-mp3-transcoder.vala b/src/librygel-core/rygel-mp3-transcoder.vala
index ecbdd455..ecbdd455 100644
--- a/src/rygel/rygel-mp3-transcoder.vala
+++ b/src/librygel-core/rygel-mp3-transcoder.vala
diff --git a/src/rygel/rygel-music-item.vala b/src/librygel-core/rygel-music-item.vala
index 6c997c30..6c997c30 100644
--- a/src/rygel/rygel-music-item.vala
+++ b/src/librygel-core/rygel-music-item.vala
diff --git a/src/rygel/rygel-panasonic-hacks.vala b/src/librygel-core/rygel-panasonic-hacks.vala
index f77a14de..f77a14de 100644
--- a/src/rygel/rygel-panasonic-hacks.vala
+++ b/src/librygel-core/rygel-panasonic-hacks.vala
diff --git a/src/rygel/rygel-photo-item.vala b/src/librygel-core/rygel-photo-item.vala
index 99dd0b3a..99dd0b3a 100644
--- a/src/rygel/rygel-photo-item.vala
+++ b/src/librygel-core/rygel-photo-item.vala
diff --git a/src/rygel/rygel-plugin-loader.vala b/src/librygel-core/rygel-plugin-loader.vala
index 528cfd06..6e79d236 100644
--- a/src/rygel/rygel-plugin-loader.vala
+++ b/src/librygel-core/rygel-plugin-loader.vala
@@ -200,4 +200,3 @@ public class Rygel.PluginLoader : Object {
         return file_info.get_file_type () == FileType.DIRECTORY;
     }
 }
-
diff --git a/src/rygel/rygel-plugin.vala b/src/librygel-core/rygel-plugin.vala
index 261cb83f..3d0b6e11 100644
--- a/src/rygel/rygel-plugin.vala
+++ b/src/librygel-core/rygel-plugin.vala
@@ -142,4 +142,3 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
         this.default_icons.add (icon);
     }
 }
-
diff --git a/src/rygel/rygel-relational-expression.vala b/src/librygel-core/rygel-relational-expression.vala
index 8b1295e5..8b1295e5 100644
--- a/src/rygel/rygel-relational-expression.vala
+++ b/src/librygel-core/rygel-relational-expression.vala
diff --git a/src/rygel/rygel-rendering-control.vala b/src/librygel-core/rygel-rendering-control.vala
index 35ebce80..35ebce80 100644
--- a/src/rygel/rygel-rendering-control.vala
+++ b/src/librygel-core/rygel-rendering-control.vala
diff --git a/src/rygel/rygel-resource-info.vala b/src/librygel-core/rygel-resource-info.vala
index 13413169..0dc28056 100644
--- a/src/rygel/rygel-resource-info.vala
+++ b/src/librygel-core/rygel-resource-info.vala
@@ -46,4 +46,3 @@ public class Rygel.ResourceInfo {
         this.type = type;
     }
 }
-
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/librygel-core/rygel-root-device-factory.vala
index 190da17d..73633edb 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/librygel-core/rygel-root-device-factory.vala
@@ -365,4 +365,3 @@ public class Rygel.RootDeviceFactory {
         return "uuid:" + (string) udn;
     }
 }
-
diff --git a/src/rygel/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
index f8ed9ce1..4adf28d1 100644
--- a/src/rygel/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -59,4 +59,3 @@ public class Rygel.RootDevice: GUPnP.RootDevice {
         }
     }
 }
-
diff --git a/src/rygel/rygel-search-criteria-parser.vala b/src/librygel-core/rygel-search-criteria-parser.vala
index 99f5988b..99d1f8f4 100644
--- a/src/rygel/rygel-search-criteria-parser.vala
+++ b/src/librygel-core/rygel-search-criteria-parser.vala
@@ -236,4 +236,3 @@ internal class Rygel.SearchCriteriaParser : Object, StateMachine {
     }
 
 }
-
diff --git a/src/rygel/rygel-search-expression.vala b/src/librygel-core/rygel-search-expression.vala
index 16e4f489..16e4f489 100644
--- a/src/rygel/rygel-search-expression.vala
+++ b/src/librygel-core/rygel-search-expression.vala
diff --git a/src/rygel/rygel-search.vala b/src/librygel-core/rygel-search.vala
index 1d5e66ad..b050eff0 100644
--- a/src/rygel/rygel-search.vala
+++ b/src/librygel-core/rygel-search.vala
@@ -93,4 +93,3 @@ internal class Rygel.Search:  Rygel.MediaQueryAction {
         base.handle_error (error);
     }
 }
-
diff --git a/src/rygel/rygel-searchable-container.vala b/src/librygel-core/rygel-searchable-container.vala
index 8334c429..8334c429 100644
--- a/src/rygel/rygel-searchable-container.vala
+++ b/src/librygel-core/rygel-searchable-container.vala
diff --git a/src/rygel/rygel-simple-container.vala b/src/librygel-core/rygel-simple-container.vala
index 4b82bb40..4b82bb40 100644
--- a/src/rygel/rygel-simple-container.vala
+++ b/src/librygel-core/rygel-simple-container.vala
diff --git a/src/rygel/rygel-sink-connection-manager.vala b/src/librygel-core/rygel-sink-connection-manager.vala
index cea868c0..cea868c0 100644
--- a/src/rygel/rygel-sink-connection-manager.vala
+++ b/src/librygel-core/rygel-sink-connection-manager.vala
diff --git a/src/rygel/rygel-source-connection-manager.vala b/src/librygel-core/rygel-source-connection-manager.vala
index 9903c6ff..9903c6ff 100644
--- a/src/rygel/rygel-source-connection-manager.vala
+++ b/src/librygel-core/rygel-source-connection-manager.vala
diff --git a/src/rygel/rygel-state-machine.vala b/src/librygel-core/rygel-state-machine.vala
index f3ef6226..e4625fbc 100644
--- a/src/rygel/rygel-state-machine.vala
+++ b/src/librygel-core/rygel-state-machine.vala
@@ -33,4 +33,3 @@ public interface Rygel.StateMachine: GLib.Object {
 
     public async abstract void run ();
 }
-
diff --git a/src/rygel/rygel-subtitle-manager.vala b/src/librygel-core/rygel-subtitle-manager.vala
index cb0cf092..cb0cf092 100644
--- a/src/rygel/rygel-subtitle-manager.vala
+++ b/src/librygel-core/rygel-subtitle-manager.vala
diff --git a/src/rygel/rygel-subtitle.vala b/src/librygel-core/rygel-subtitle.vala
index 0e4ff4f1..0e4ff4f1 100644
--- a/src/rygel/rygel-subtitle.vala
+++ b/src/librygel-core/rygel-subtitle.vala
diff --git a/src/rygel/rygel-thumbnail.vala b/src/librygel-core/rygel-thumbnail.vala
index e4f3a9cd..e4f3a9cd 100644
--- a/src/rygel/rygel-thumbnail.vala
+++ b/src/librygel-core/rygel-thumbnail.vala
diff --git a/src/rygel/rygel-thumbnailer.vala b/src/librygel-core/rygel-thumbnailer.vala
index 35d55458..35d55458 100644
--- a/src/rygel/rygel-thumbnailer.vala
+++ b/src/librygel-core/rygel-thumbnailer.vala
diff --git a/src/rygel/rygel-transcode-manager.vala b/src/librygel-core/rygel-transcode-manager.vala
index 47ac9e6c..69e1f484 100644
--- a/src/rygel/rygel-transcode-manager.vala
+++ b/src/librygel-core/rygel-transcode-manager.vala
@@ -152,4 +152,3 @@ internal abstract class Rygel.TranscodeManager : GLib.Object {
         return protocol_infos;
     }
 }
-
diff --git a/src/rygel/rygel-transcoder.vala b/src/librygel-core/rygel-transcoder.vala
index 2071bfb0..2071bfb0 100644
--- a/src/rygel/rygel-transcoder.vala
+++ b/src/librygel-core/rygel-transcoder.vala
diff --git a/src/rygel/rygel-user-config.vala b/src/librygel-core/rygel-user-config.vala
index e7e867c8..06efffd7 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/librygel-core/rygel-user-config.vala
@@ -294,4 +294,3 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
         return val;
     }
 }
-
diff --git a/src/rygel/rygel-v1-hacks.vala b/src/librygel-core/rygel-v1-hacks.vala
index 3e1a6bcd..3e1a6bcd 100644
--- a/src/rygel/rygel-v1-hacks.vala
+++ b/src/librygel-core/rygel-v1-hacks.vala
diff --git a/src/rygel/rygel-video-item.vala b/src/librygel-core/rygel-video-item.vala
index 36dbd04f..36dbd04f 100644
--- a/src/rygel/rygel-video-item.vala
+++ b/src/librygel-core/rygel-video-item.vala
diff --git a/src/rygel/rygel-video-transcoder.vala b/src/librygel-core/rygel-video-transcoder.vala
index f01da21b..f01da21b 100644
--- a/src/rygel/rygel-video-transcoder.vala
+++ b/src/librygel-core/rygel-video-transcoder.vala
diff --git a/src/rygel/rygel-visual-item.vala b/src/librygel-core/rygel-visual-item.vala
index 0352f65f..0352f65f 100644
--- a/src/rygel/rygel-visual-item.vala
+++ b/src/librygel-core/rygel-visual-item.vala
diff --git a/src/rygel/rygel-volume.vala b/src/librygel-core/rygel-volume.vala
index d7be26e9..d7be26e9 100644
--- a/src/rygel/rygel-volume.vala
+++ b/src/librygel-core/rygel-volume.vala
diff --git a/src/rygel/rygel-wmp-hacks.vala b/src/librygel-core/rygel-wmp-hacks.vala
index 7e9d23dc..7e9d23dc 100644
--- a/src/rygel/rygel-wmp-hacks.vala
+++ b/src/librygel-core/rygel-wmp-hacks.vala
diff --git a/src/rygel/rygel-wmv-transcoder.vala b/src/librygel-core/rygel-wmv-transcoder.vala
index 947ee04d..947ee04d 100644
--- a/src/rygel/rygel-wmv-transcoder.vala
+++ b/src/librygel-core/rygel-wmv-transcoder.vala
diff --git a/src/rygel/rygel-writable-container.vala b/src/librygel-core/rygel-writable-container.vala
index bc9097a2..bc9097a2 100644
--- a/src/rygel/rygel-writable-container.vala
+++ b/src/librygel-core/rygel-writable-container.vala
diff --git a/src/rygel/rygel-xbmc-hacks.vala b/src/librygel-core/rygel-xbmc-hacks.vala
index 8659c9bb..8659c9bb 100644
--- a/src/rygel/rygel-xbmc-hacks.vala
+++ b/src/librygel-core/rygel-xbmc-hacks.vala
diff --git a/src/rygel/rygel-xbox-hacks.vala b/src/librygel-core/rygel-xbox-hacks.vala
index b2f046cd..b2f046cd 100644
--- a/src/rygel/rygel-xbox-hacks.vala
+++ b/src/librygel-core/rygel-xbox-hacks.vala
diff --git a/src/rygel/rygel-xml-utils.vala b/src/librygel-core/rygel-xml-utils.vala
index da44b3f1..5c33057e 100644
--- a/src/rygel/rygel-xml-utils.vala
+++ b/src/librygel-core/rygel-xml-utils.vala
@@ -49,4 +49,3 @@ public class Rygel.XMLUtils {
         return ret;
     }
 }
-
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 86eadae8..438a3881 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -9,133 +9,12 @@ AM_CFLAGS += \
 	-DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
 	-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
 
-librygelincdir = $(includedir)/rygel-1.0
-
-librygelinc_HEADERS = rygel-core.h
-
-lib_LTLIBRARIES = librygel-core-1.0.la
-
-VAPI_SOURCE_FILES = \
-	rygel-cmdline-config.vala \
-	rygel-root-device.vala \
-	rygel-root-device-factory.vala \
-	rygel-audio-item.vala \
-	rygel-dbus-interface.vala \
-	rygel-icon-info.vala \
-	rygel-image-item.vala \
-	rygel-log-handler.vala \
-	rygel-logical-expression.vala \
-	rygel-media-art-store.vala \
-	rygel-media-objects.vala \
-	rygel-media-renderer-plugin.vala \
-	rygel-meta-config.vala \
-	rygel-music-item.vala \
-	rygel-photo-item.vala \
-	rygel-plugin-loader.vala \
-	rygel-plugin.vala \
-	rygel-relational-expression.vala \
-	rygel-resource-info.vala \
-	rygel-simple-container.vala \
-	rygel-subtitle.vala \
-	rygel-thumbnail.vala \
-	rygel-user-config.vala \
-	rygel-video-item.vala \
-	rygel-media-container.vala \
-	rygel-media-item.vala \
-	rygel-media-object.vala \
-	rygel-media-server-plugin.vala \
-	rygel-search-expression.vala \
-	rygel-configuration.vala \
-	rygel-free-desktop-interfaces.vala \
-	rygel-media-player.vala \
-	rygel-searchable-container.vala \
-	rygel-state-machine.vala \
-	rygel-visual-item.vala \
-	rygel-writable-container.vala \
-	rygel-xml-utils.vala
-
-librygel_core_1_0_la_SOURCES = \
-	$(VAPI_SOURCE_FILES) \
-	rygel-http-item-uri.vala \
-	rygel-environment-config.vala \
-	rygel-content-directory.vala \
-	rygel-connection-manager.vala \
-	rygel-source-connection-manager.vala \
-	rygel-sink-connection-manager.vala \
-	rygel-av-transport.vala \
-	rygel-rendering-control.vala \
-	rygel-transcode-manager.vala \
-	rygel-http-server.vala \
-	rygel-http-request.vala \
-	rygel-http-get-handler.vala \
-	rygel-http-get.vala \
-	rygel-http-post.vala \
-	rygel-http-identity-handler.vala \
-	rygel-http-transcode-handler.vala \
-	rygel-http-seek.vala \
-	rygel-http-byte-seek.vala \
-	rygel-http-time-seek.vala \
-	rygel-http-response.vala \
-	rygel-http-gst-sink.vala \
-	rygel-thumbnailer.vala \
-	rygel-dbus-thumbnailer.vala \
-	rygel-subtitle-manager.vala \
-	rygel-media-query-action.vala \
-	rygel-browse.vala \
-	rygel-search.vala \
-	rygel-client-hacks.vala \
-	rygel-xbox-hacks.vala \
-	rygel-panasonic-hacks.vala \
-	rygel-xbmc-hacks.vala \
-	rygel-wmp-hacks.vala \
-	rygel-v1-hacks.vala \
-	rygel-import-resource.vala \
-	rygel-item-creator.vala \
-	rygel-item-destroyer.vala \
-	rygel-item-removal-queue.vala \
-	rygel-search-criteria-parser.vala \
-	rygel-transcoder.vala \
-	rygel-audio-transcoder.vala \
-	rygel-video-transcoder.vala \
-	rygel-mp2ts-transcoder.vala \
-	rygel-mp3-transcoder.vala \
-	rygel-l16-transcoder.vala \
-	rygel-wmv-transcoder.vala \
-	rygel-aac-transcoder.vala \
-	rygel-avc-transcoder.vala \
-	rygel-gst-utils.vala \
-	rygel-media-receiver-registrar.vala \
-	rygel-changelog.vala \
-	rygel-volume.vala \
-	rygel-description-file.vala
-
-librygel_core_1_0_la_VALAFLAGS = \
-	-H rygel-core.h -C --library=rygel-core-1.0 \
-	--pkg gstreamer-0.10 \
-	--pkg gstreamer-base-0.10 \
-	--pkg gupnp-dlna-1.0 \
-	$(RYGEL_COMMON_VALAFLAGS)
-
-librygel_core_1_0_la_LIBADD = \
-	$(GST_PBU_LIBS) \
-	$(RYGEL_BASE_LIBS) \
-	$(LIBGUPNP_DLNA_LIBS) \
-	$(GIO_LIBS) \
-	$(LIBSOUP_LIBS)
-
-RYGEL_CORE_VERSION=0:0:0
-librygel_core_1_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
-
 bin_PROGRAMS = rygel
 
-BUILT_SOURCES = \
-	rygel-core-1.0.vapi \
-	rygel-core.h
-
 rygel_SOURCES = \
 	rygel-dbus-service.vala \
 	rygel-main.vala \
-	rygel-core-1.0.vapi
+	$(top_builddir)/src/librygel-core/rygel-core-1.0.vapi
 
 rygel_VALAFLAGS = \
 	--pkg posix \
@@ -144,17 +23,13 @@ rygel_VALAFLAGS = \
 	$(RYGEL_COMMON_VALAFLAGS)
 
 rygel_LDADD = \
-	librygel-core-1.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
 	$(RYGEL_BASE_LIBS)
 
 rygel_LDFLAGS = -export-dynamic
 
-VAPI_FILES = rygel-core-1.0.vapi
-DEPS_FILES = rygel-core-1.0.deps
-
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
 
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5739c993..90acdded 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,8 +79,8 @@ rygel_http_post_test_SOURCES = rygel-http-post-test.vala \
 
 rygel_album_art_spec_test_SOURCES = rygel-album-art-spec-test.vala \
 			       rygel-media-art-store.vala \
-				   ../src/rygel/rygel-thumbnail.vala \
-				   ../src/rygel/rygel-icon-info.vala
+				   $(top_srcdir)/src/librygel-core/rygel-thumbnail.vala \
+				   $(top_srcdir)/src/librygel-core/rygel-icon-info.vala
 
 rygel_searchable_container_test_SOURCES = \
 	rygel-searchable-container.vala \
diff --git a/tests/rygel-gst-utils.vala b/tests/rygel-gst-utils.vala
index 0cf84c77..6b609846 120000
--- a/tests/rygel-gst-utils.vala
+++ b/tests/rygel-gst-utils.vala
@@ -1 +1 @@
-../src/rygel/rygel-gst-utils.vala
\ No newline at end of file
+../src/librygel-core/rygel-gst-utils.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek.vala b/tests/rygel-http-byte-seek.vala
index c394bbde..74119d57 120000
--- a/tests/rygel-http-byte-seek.vala
+++ b/tests/rygel-http-byte-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek_http-get.vala b/tests/rygel-http-byte-seek_http-get.vala
index c394bbde..74119d57 120000
--- a/tests/rygel-http-byte-seek_http-get.vala
+++ b/tests/rygel-http-byte-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-byte-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-get.vala b/tests/rygel-http-get.vala
index 1bcf54bc..4e52f8e7 120000
--- a/tests/rygel-http-get.vala
+++ b/tests/rygel-http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-get.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-get.vala
\ No newline at end of file
diff --git a/tests/rygel-http-gst-sink.vala b/tests/rygel-http-gst-sink.vala
index b3ec9d89..23b7d24e 120000
--- a/tests/rygel-http-gst-sink.vala
+++ b/tests/rygel-http-gst-sink.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-gst-sink.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-gst-sink.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri.vala b/tests/rygel-http-item-uri.vala
index b6cf2d85..88bc91b1 120000
--- a/tests/rygel-http-item-uri.vala
+++ b/tests/rygel-http-item-uri.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-get.vala b/tests/rygel-http-item-uri_http-get.vala
index b6cf2d85..88bc91b1 120000
--- a/tests/rygel-http-item-uri_http-get.vala
+++ b/tests/rygel-http-item-uri_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-post.vala b/tests/rygel-http-item-uri_http-post.vala
index b6cf2d85..88bc91b1 120000
--- a/tests/rygel-http-item-uri_http-post.vala
+++ b/tests/rygel-http-item-uri_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-item-uri.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-post.vala b/tests/rygel-http-post.vala
index 69cab6a6..2f1ca708 120000
--- a/tests/rygel-http-post.vala
+++ b/tests/rygel-http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-post.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-post.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-get.vala b/tests/rygel-http-request_http-get.vala
index 611f7e5e..38f0509c 120000
--- a/tests/rygel-http-request_http-get.vala
+++ b/tests/rygel-http-request_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-post.vala b/tests/rygel-http-request_http-post.vala
index 611f7e5e..38f0509c 120000
--- a/tests/rygel-http-request_http-post.vala
+++ b/tests/rygel-http-request_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-request.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-response.vala b/tests/rygel-http-response.vala
index e23cfdf1..fc06488f 120000
--- a/tests/rygel-http-response.vala
+++ b/tests/rygel-http-response.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-response.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-response.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek.vala b/tests/rygel-http-seek.vala
index 343aaf62..681442af 120000
--- a/tests/rygel-http-seek.vala
+++ b/tests/rygel-http-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_http-get.vala b/tests/rygel-http-seek_http-get.vala
index 343aaf62..681442af 120000
--- a/tests/rygel-http-seek_http-get.vala
+++ b/tests/rygel-http-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_time-seek.vala b/tests/rygel-http-seek_time-seek.vala
index 343aaf62..681442af 120000
--- a/tests/rygel-http-seek_time-seek.vala
+++ b/tests/rygel-http-seek_time-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek.vala b/tests/rygel-http-time-seek.vala
index 48b688bc..e5ea5618 120000
--- a/tests/rygel-http-time-seek.vala
+++ b/tests/rygel-http-time-seek.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek_http-get.vala b/tests/rygel-http-time-seek_http-get.vala
index 48b688bc..e5ea5618 120000
--- a/tests/rygel-http-time-seek_http-get.vala
+++ b/tests/rygel-http-time-seek_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-http-time-seek.vala
\ No newline at end of file
+../src/librygel-core/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-item-creator.vala b/tests/rygel-item-creator.vala
index 4d22d871..39e7ca38 120000
--- a/tests/rygel-item-creator.vala
+++ b/tests/rygel-item-creator.vala
@@ -1 +1 @@
-../src/rygel/rygel-item-creator.vala
\ No newline at end of file
+../src/librygel-core/rygel-item-creator.vala
\ No newline at end of file
diff --git a/tests/rygel-media-art-store.vala b/tests/rygel-media-art-store.vala
index ce7e89c8..107e3f0d 120000
--- a/tests/rygel-media-art-store.vala
+++ b/tests/rygel-media-art-store.vala
@@ -1 +1 @@
-../src/rygel/rygel-media-art-store.vala
\ No newline at end of file
+../src/librygel-core/rygel-media-art-store.vala
\ No newline at end of file
diff --git a/tests/rygel-relational-expression.vala b/tests/rygel-relational-expression.vala
index d0490ad0..9b8040aa 120000
--- a/tests/rygel-relational-expression.vala
+++ b/tests/rygel-relational-expression.vala
@@ -1 +1 @@
-../src/rygel/rygel-relational-expression.vala
\ No newline at end of file
+../src/librygel-core/rygel-relational-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-search-expression.vala b/tests/rygel-search-expression.vala
index 58920057..237ceaa7 120000
--- a/tests/rygel-search-expression.vala
+++ b/tests/rygel-search-expression.vala
@@ -1 +1 @@
-../src/rygel/rygel-search-expression.vala
\ No newline at end of file
+../src/librygel-core/rygel-search-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-searchable-container.vala b/tests/rygel-searchable-container.vala
index d9e06601..aa5485e7 120000
--- a/tests/rygel-searchable-container.vala
+++ b/tests/rygel-searchable-container.vala
@@ -1 +1 @@
-../src/rygel/rygel-searchable-container.vala
\ No newline at end of file
+../src/librygel-core/rygel-searchable-container.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-get.vala b/tests/rygel-state-machine_http-get.vala
index 5063d685..2b3a7af9 120000
--- a/tests/rygel-state-machine_http-get.vala
+++ b/tests/rygel-state-machine_http-get.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-post.vala b/tests/rygel-state-machine_http-post.vala
index 5063d685..2b3a7af9 120000
--- a/tests/rygel-state-machine_http-post.vala
+++ b/tests/rygel-state-machine_http-post.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-response.vala b/tests/rygel-state-machine_http-response.vala
index 5063d685..2b3a7af9 120000
--- a/tests/rygel-state-machine_http-response.vala
+++ b/tests/rygel-state-machine_http-response.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_item-creator.vala b/tests/rygel-state-machine_item-creator.vala
index 5063d685..2b3a7af9 120000
--- a/tests/rygel-state-machine_item-creator.vala
+++ b/tests/rygel-state-machine_item-creator.vala
@@ -1 +1 @@
-../src/rygel/rygel-state-machine.vala
\ No newline at end of file
+../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file