[rygel] all: Extract librygel-core and rygel binary

[Jens Georg <jensgeorg src gnome org>]

commit fb5553843abe314498d890b2d5f48b1c28ef7fe8
Author: Jens Georg <mail jensge org>
Date:   Thu Jun 7 13:42:53 2012 +0200

    all: Extract librygel-core and rygel binary

 common.am                                |    6 +-
 src/rygel/Makefile.am                    |  127 +++++++++++++++---------------
 src/rygel/rygel-cmdline-config.vala      |    6 +-
 src/rygel/rygel-root-device-factory.vala |    4 +-
 src/rygel/rygel-root-device.vala         |    4 +-
 src/ui/Makefile.am                       |    1 -
 6 files changed, 78 insertions(+), 70 deletions(-)
---
diff --git a/common.am b/common.am
index 880307f..d2bfcc5 100644
--- a/common.am
+++ b/common.am
@@ -35,7 +35,7 @@ AM_CFLAGS = \
 	-DPRESET_DIR='"$(presetdir)"'\
 	-include config.h
 
-RYGEL_COMMON_LIBS = \
+RYGEL_BASE_LIBS = \
 	$(LIBGUPNP_LIBS) \
 	$(LIBGUPNP_AV_LIBS) \
 	$(LIBGSTREAMER_LIBS) \
@@ -44,6 +44,10 @@ RYGEL_COMMON_LIBS = \
 	$(UUID_LIBS) \
 	$(COVERAGE_LIBS)
 
+RYGEL_COMMON_LIBS = \
+	$(RYGEL_BASE_LIBS) \
+	$(top_builddir)/src/rygel/librygel-core.la
+
 # Note: the -g needs to be at the end of VALAFLAGS to not break make dist
 RYGEL_COMMON_PLUGIN_VALAFLAGS = \
 	--pkg rygel-1.0 \
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index a7714ff..311750f 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -13,20 +13,50 @@ librygelincdir = $(includedir)/rygel-1.0
 
 librygelinc_HEADERS = rygel.h
 
-bin_PROGRAMS = rygel
+lib_LTLIBRARIES = librygel-core.la
 
-BUILT_SOURCES = \
-	rygel-1.0.vapi \
-	rygel.h
+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
 
-rygel_SOURCES = \
+librygel_core_la_SOURCES = \
 	$(VAPI_SOURCE_FILES) \
 	rygel-http-item-uri.vala \
-	rygel-dbus-service.vala \
-	rygel-root-device.vala \
-	rygel-root-device-factory.vala \
-	rygel-main.vala \
-	rygel-cmdline-config.vala \
 	rygel-environment-config.vala \
 	rygel-content-directory.vala \
 	rygel-connection-manager.vala \
@@ -79,59 +109,39 @@ rygel_SOURCES = \
 	rygel-volume.vala \
 	rygel-description-file.vala
 
-VAPI_SOURCE_FILES = \
-	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
-
-rygel_VALAFLAGS = \
+librygel_core_la_VALAFLAGS = \
 	-H rygel.h -C --library=rygel-1.0 \
-	--pkg rygel-misc \
 	--pkg gstreamer-0.10 \
 	--pkg gstreamer-base-0.10 \
 	--pkg gupnp-dlna-1.0 \
-	--pkg posix \
 	$(RYGEL_COMMON_VALAFLAGS)
 
-rygel_LDADD = \
-	librygel-configuration.a \
-	$(RYGEL_COMMON_LIBS) \
-	$(LIBGUPNP_DLNA_LIBS) \
+librygel_core_la_LIBADD = \
 	$(GST_PBU_LIBS) \
+	$(RYGEL_BASE_LIBS) \
+	$(LIBGUPNP_DLNA_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBSOUP_LIBS)
 
+bin_PROGRAMS = rygel
+
+BUILT_SOURCES = \
+	rygel-1.0.vapi \
+	rygel.h
+
+rygel_SOURCES = \
+	rygel-dbus-service.vala \
+	rygel-main.vala
+
+rygel_VALAFLAGS = \
+	--pkg posix \
+	--pkg rygel-misc \
+	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+
+rygel_LDADD = \
+	librygel-core.la \
+	$(RYGEL_COMMON_LIBS)
+
 rygel_LDFLAGS = -export-dynamic
 
 VAPI_FILES = rygel-1.0.vapi
@@ -141,17 +151,6 @@ vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
 rygel-1.0.vapi rygel.h: $(VAPI_SOURCE_FILES)
 
-noinst_LIBRARIES = librygel-configuration.a
-
-librygel_configuration_a_SOURCES = \
-	rygel-configuration.c \
-	rygel-user-config.c \
-	rygel-meta-config.c \
-	rygel-cmdline-config.c \
-	rygel-environment-config.c \
-	rygel-dbus-interface.c \
-	rygel-free-desktop-interfaces.c
-
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = \
diff --git a/src/rygel/rygel-cmdline-config.vala b/src/rygel/rygel-cmdline-config.vala
index ba53c73..7cd9f88 100644
--- a/src/rygel/rygel-cmdline-config.vala
+++ b/src/rygel/rygel-cmdline-config.vala
@@ -1,9 +1,11 @@
 /*
  * Copyright (C) 2008,2009 Nokia Corporation.
  * Copyright (C) 2008,2009 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Openismus GmbH.
  *
  * Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
  *                               <zeeshan ali nokia com>
+ *         Jens Georg <jensg openismus com>
  *
  * This file is part of Rygel.
  *
@@ -24,14 +26,14 @@
 
 using Gee;
 
-internal errordomain Rygel.CmdlineConfigError {
+public errordomain Rygel.CmdlineConfigError {
     VERSION_ONLY
 }
 
 /**
  * Manages configuration from Commandline arguments.
  */
-internal class Rygel.CmdlineConfig : GLib.Object, Configuration {
+public class Rygel.CmdlineConfig : GLib.Object, Configuration {
     private static string iface;
     private static int port;
 
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index 9906e2f..ed66497 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -2,10 +2,12 @@
  * Copyright (C) 2008-2010 Nokia Corporation.
  * Copyright (C) 2008 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
  * Copyright (C) 2007 OpenedHand Ltd.
+ * Copyright (C) 2012 Openismus GmbH.
  *
  * Authors: Zeeshan Ali (Khattak) <zeeshanak gnome org>
  *                                <zeeshan ali nokia com>
  *          Jorn Baayen <jorn openedhand com>
+ *          Jens Georg <jensg openismus com>
  *
  * This file is part of Rygel.
  *
@@ -43,7 +45,7 @@ public errordomain RootDeviceFactoryError {
  * Factory for RootDevice objects. Give it a plugin and it will create a
  * Root device for that.
  */
-internal class Rygel.RootDeviceFactory {
+public class Rygel.RootDeviceFactory {
     public GUPnP.Context context;
 
     private Configuration config;
diff --git a/src/rygel/rygel-root-device.vala b/src/rygel/rygel-root-device.vala
index 9984966..f8ed9ce 100644
--- a/src/rygel/rygel-root-device.vala
+++ b/src/rygel/rygel-root-device.vala
@@ -1,8 +1,10 @@
 /*
  * Copyright (C) 2008 Nokia Corporation.
  * Copyright (C) 2008 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ * Copyright (C) 2012 Openismus GmbH.
  *
  * Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
+ *         Jens Georg <jensg openismus com>
  *
  * This file is part of Rygel.
  *
@@ -27,7 +29,7 @@ using Gee;
 /**
  * Represents a Root device.
  */
-internal class Rygel.RootDevice: GUPnP.RootDevice {
+public class Rygel.RootDevice: GUPnP.RootDevice {
     internal ArrayList<ServiceInfo> services;   /* Services we implement */
 
     public RootDevice (GUPnP.Context context,
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index ff6463a..644dde6 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -19,7 +19,6 @@ rygel_preferences_VALAFLAGS = \
 	--pkg gtk+-3.0 $(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 
 rygel_preferences_LDADD = \
-	$(abs_top_builddir)/src/rygel/librygel-configuration.a \
 	$(RYGEL_COMMON_LIBS) \
 	$(GTK_LIBS)
 rygel_preferences_LDFLAGS = -export-dynamic