[rygel] core: Rename core library

[Jens Georg <jensgeorg src gnome org>]

commit 31d8482ca2372c6a4cffab8104a107c445abc937
Author: Jens Georg <mail jensge org>
Date:   Fri Jun 22 16:15:51 2012 +0200

    core: Rename core library

 Makefile.am                                       |    4 +-
 common.am                                         |    4 +-
 configure.ac                                      |    2 +-
 rygel-1.0.pc.in => rygel-core-1.0.pc.in           |    4 +-
 src/rygel/Makefile.am                             |   26 +++++++++++---------
 src/rygel/{rygel-1.0.deps => rygel-core-1.0.deps} |    0
 6 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9549250..ce1793c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = src data tests po doc examples
 
-pkgconfig_DATA= rygel-1.0.pc
+pkgconfig_DATA= rygel-core-1.0.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = rygel-1.0.pc.in \
+EXTRA_DIST = rygel-core-1.0.pc.in \
              .version
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/common.am b/common.am
index d2bfcc5..a3667b8 100644
--- a/common.am
+++ b/common.am
@@ -46,11 +46,11 @@ RYGEL_BASE_LIBS = \
 
 RYGEL_COMMON_LIBS = \
 	$(RYGEL_BASE_LIBS) \
-	$(top_builddir)/src/rygel/librygel-core.la
+	$(top_builddir)/src/rygel/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 = \
-	--pkg rygel-1.0 \
+	--pkg rygel-core-1.0 \
 	$(RYGEL_COMMON_VALAFLAGS)
 
 RYGEL_COMMON_VALAFLAGS = \
diff --git a/configure.ac b/configure.ac
index 62f105b..140b6af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@ data/rygel.desktop.in
 data/rygel-preferences.desktop.in
 doc/Makefile
 po/Makefile.in
-rygel-1.0.pc
+rygel-core-1.0.pc
 tests/Makefile
 examples/Makefile
 ])
diff --git a/rygel-1.0.pc.in b/rygel-core-1.0.pc.in
similarity index 82%
rename from rygel-1.0.pc.in
rename to rygel-core-1.0.pc.in
index 10714e5..c2c4929 100644
--- a/rygel-1.0.pc.in
+++ b/rygel-core-1.0.pc.in
@@ -3,10 +3,10 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: rygel-1.0
+Name: rygel-core-1.0
 Description: GNOME (Mobile) UPnP/DLNA Media Server
 Version: @VERSION@
-Libs:
+Libs: -L${libdir} -lrygel-core-1.0
 Cflags: -I${includedir}/rygel-1.0
 Requires: gupnp-av-1.0 gee-1.0 gstreamer-0.10
 Requires.Private: uuid gmodule-2.0
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 6a05640..e3bf54a 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -13,7 +13,7 @@ librygelincdir = $(includedir)/rygel-1.0
 
 librygelinc_HEADERS = rygel-core.h
 
-lib_LTLIBRARIES = librygel-core.la
+lib_LTLIBRARIES = librygel-core-1.0.la
 
 VAPI_SOURCE_FILES = \
 	rygel-cmdline-config.vala \
@@ -54,7 +54,7 @@ VAPI_SOURCE_FILES = \
 	rygel-writable-container.vala \
 	rygel-xml-utils.vala
 
-librygel_core_la_SOURCES = \
+librygel_core_1_0_la_SOURCES = \
 	$(VAPI_SOURCE_FILES) \
 	rygel-http-item-uri.vala \
 	rygel-environment-config.vala \
@@ -109,14 +109,14 @@ librygel_core_la_SOURCES = \
 	rygel-volume.vala \
 	rygel-description-file.vala
 
-librygel_core_la_VALAFLAGS = \
-	-H rygel-core.h -C --library=rygel-1.0 \
+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_la_LIBADD = \
+librygel_core_1_0_la_LIBADD = \
 	$(GST_PBU_LIBS) \
 	$(RYGEL_BASE_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
@@ -126,30 +126,32 @@ librygel_core_la_LIBADD = \
 bin_PROGRAMS = rygel
 
 BUILT_SOURCES = \
-	rygel-1.0.vapi \
+	rygel-core-1.0.vapi \
 	rygel-core.h
 
 rygel_SOURCES = \
 	rygel-dbus-service.vala \
-	rygel-main.vala
+	rygel-main.vala \
+	rygel-core-1.0.vapi
 
 rygel_VALAFLAGS = \
 	--pkg posix \
 	--pkg rygel-misc \
-	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
+	--pkg gstreamer-0.10 \
+	$(RYGEL_COMMON_VALAFLAGS)
 
 rygel_LDADD = \
-	librygel-core.la \
+	librygel-core-1.0.la \
 	$(RYGEL_BASE_LIBS)
 
 rygel_LDFLAGS = -export-dynamic
 
-VAPI_FILES = rygel-1.0.vapi
-DEPS_FILES = rygel-1.0.deps
+VAPI_FILES = rygel-core-1.0.vapi
+DEPS_FILES = rygel-core-1.0.deps
 
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-1.0.vapi rygel-core.h: $(VAPI_SOURCE_FILES)
+rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
 
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
diff --git a/src/rygel/rygel-1.0.deps b/src/rygel/rygel-core-1.0.deps
similarity index 100%
rename from src/rygel/rygel-1.0.deps
rename to src/rygel/rygel-core-1.0.deps