summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/librygel-core/Makefile.am26
-rw-r--r--src/librygel-core/rygel-core-2.2.deps (renamed from src/librygel-core/rygel-core-2.0.deps)0
-rw-r--r--src/librygel-renderer-gst/Makefile.am26
-rw-r--r--src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps2
-rw-r--r--src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps2
-rw-r--r--src/librygel-renderer/Makefile.am24
-rw-r--r--src/librygel-renderer/rygel-renderer-2.0.deps1
-rw-r--r--src/librygel-renderer/rygel-renderer-2.2.deps1
-rw-r--r--src/librygel-server/Makefile.am24
-rw-r--r--src/librygel-server/rygel-server-2.2.deps (renamed from src/librygel-server/rygel-server-2.0.deps)2
-rw-r--r--src/plugins/playbin/Makefile.am2
11 files changed, 55 insertions, 55 deletions
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index eaca37a8..e9844887 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -1,25 +1,25 @@
include $(top_srcdir)/common.am
include $(srcdir)/filelist.am
-librygelincdir = $(includedir)/rygel-2.0
+librygelincdir = $(includedir)/rygel-2.2
librygelinc_HEADERS = rygel-core.h
-lib_LTLIBRARIES = librygel-core-2.0.la
+lib_LTLIBRARIES = librygel-core-2.2.la
-librygel_core_2_0_la_SOURCES = \
+librygel_core_2_2_la_SOURCES = \
$(LIBRYGEL_CORE_VAPI_SOURCE_FILES) \
$(LIBRYGEL_CORE_NONVAPI_SOURCE_FILES)
-librygel_core_2_0_la_VALAFLAGS = \
- -H rygel-core.h -C --library=rygel-core-2.0 \
+librygel_core_2_2_la_VALAFLAGS = \
+ -H rygel-core.h -C --library=rygel-core-2.2 \
--vapidir=$(srcdir) \
--pkg uuid \
--pkg posix \
$(LIBRYGEL_CORE_DEPS_VALAFLAGS) \
$(RYGEL_COMMON_VALAFLAGS)
-librygel_core_2_0_la_CFLAGS = \
+librygel_core_2_2_la_CFLAGS = \
$(RYGEL_COMMON_DEFINES_CFLAGS) \
$(LIBRYGEL_CORE_DEPS_CFLAGS) \
-DPLUGIN_DIR='"$(plugindir)"' \
@@ -28,24 +28,24 @@ librygel_core_2_0_la_CFLAGS = \
-include config.h \
-DG_LOG_DOMAIN='"Rygel"'
-librygel_core_2_0_la_LIBADD = \
+librygel_core_2_2_la_LIBADD = \
$(LIBRYGEL_CORE_DEPS_LIBS)
-RYGEL_CORE_VERSION=1:0:0
-librygel_core_2_0_la_LDFLAGS = \
+RYGEL_CORE_VERSION=2:2:0
+librygel_core_2_2_la_LDFLAGS = \
$(RYGEL_DATA_DIR_DEFINES) \
-version-info $(RYGEL_CORE_VERSION)
BUILT_SOURCES = \
- rygel-core-2.0.vapi \
+ rygel-core-2.2.vapi \
rygel-core.h
-VAPI_FILES = rygel-core-2.0.vapi
-DEPS_FILES = rygel-core-2.0.deps
+VAPI_FILES = rygel-core-2.2.vapi
+DEPS_FILES = rygel-core-2.2.deps
vapidir = $(VAPIDIR)
vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-2.0.vapi rygel-core.h: librygel_core_2_0_la_vala.stamp
+rygel-core-2.2.vapi rygel-core.h: librygel_core_2_2_la_vala.stamp
MAINTAINERCLEANFILES += $(BUILT_SOURCES)
diff --git a/src/librygel-core/rygel-core-2.0.deps b/src/librygel-core/rygel-core-2.2.deps
index c65d41bb..c65d41bb 100644
--- a/src/librygel-core/rygel-core-2.0.deps
+++ b/src/librygel-core/rygel-core-2.2.deps
diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am
index 40fa5a27..7ad46442 100644
--- a/src/librygel-renderer-gst/Makefile.am
+++ b/src/librygel-renderer-gst/Makefile.am
@@ -1,37 +1,37 @@
include $(top_srcdir)/common.am
include $(srcdir)/filelist.am
-librygel_renderer_includedir=$(includedir)/rygel-2.0
+librygel_renderer_includedir=$(includedir)/rygel-2.2
librygel_renderer_include_HEADERS = rygel-renderer-gst.h
-lib_LTLIBRARIES = librygel-renderer-gst-2.0.la
+lib_LTLIBRARIES = librygel-renderer-gst-2.2.la
-LIBRYGEL_RENDERER_GST_VERSION=1:0:0
+LIBRYGEL_RENDERER_GST_VERSION=2:2:0
-librygel_renderer_gst_2_0_la_SOURCES = \
+librygel_renderer_gst_2_2_la_SOURCES = \
$(LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES) \
$(LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES)
-librygel_renderer_gst_2_0_la_VALAFLAGS = \
- -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.0 \
+librygel_renderer_gst_2_2_la_VALAFLAGS = \
+ -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.2 \
--enable-experimental \
$(LIBRYGEL_RENDERER_GST_DEPS_VALAFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
$(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_gst_2_0_la_CFLAGS = \
+librygel_renderer_gst_2_2_la_CFLAGS = \
$(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS)
-librygel_renderer_gst_2_0_la_LIBADD = \
+librygel_renderer_gst_2_2_la_LIBADD = \
$(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \
$(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS)
-librygel_renderer_gst_2_0_la_LDFLAGS = \
+librygel_renderer_gst_2_2_la_LDFLAGS = \
-version-info $(LIBRYGEL_RENDERER_GST_VERSION) \
-DG_LOG_DOMAIN=\"Rygel\"
-rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi: \
- librygel_renderer_gst_2_0_la_vala.stamp
+rygel-renderer-gst.h rygel-renderer-gst-2.2.vapi: \
+ librygel_renderer_gst_2_2_la_vala.stamp
vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.deps
+vapi_DATA = rygel-renderer-gst-2.2.vapi rygel-renderer-gst-2.2.deps
-EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.deps
+EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.2.vapi rygel-renderer-gst-2.2.deps
diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps
deleted file mode 100644
index 6b76b0d8..00000000
--- a/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-rygel-renderer-2.0
-gstreamer-1.0
diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps
new file mode 100644
index 00000000..a19328e1
--- /dev/null
+++ b/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps
@@ -0,0 +1,2 @@
+rygel-renderer-2.2
+gstreamer-1.0
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index c1248d66..34af5e1e 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -1,35 +1,35 @@
include $(top_srcdir)/common.am
include $(srcdir)/filelist.am
-librygel_renderer_includedir=$(includedir)/rygel-2.0
+librygel_renderer_includedir=$(includedir)/rygel-2.2
librygel_renderer_include_HEADERS = rygel-renderer.h
-lib_LTLIBRARIES = librygel-renderer-2.0.la
+lib_LTLIBRARIES = librygel-renderer-2.2.la
-LIBRYGEL_RENDERER_VERSION=1:0:0
+LIBRYGEL_RENDERER_VERSION=2:2:0
-librygel_renderer_2_0_la_SOURCES = \
+librygel_renderer_2_2_la_SOURCES = \
$(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
$(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
-librygel_renderer_2_0_la_VALAFLAGS = \
- -H rygel-renderer.h --library=rygel-renderer-2.0 \
+librygel_renderer_2_2_la_VALAFLAGS = \
+ -H rygel-renderer.h --library=rygel-renderer-2.2 \
$(LIBRYGEL_RENDERER_DEPS_VALAFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
$(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_2_0_la_CFLAGS = \
+librygel_renderer_2_2_la_CFLAGS = \
$(LIBRYGEL_RENDERER_DEPS_CFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
-DG_LOG_DOMAIN=\"Rygel\"
-librygel_renderer_2_0_la_LIBADD = \
+librygel_renderer_2_2_la_LIBADD = \
$(LIBRYGEL_RENDERER_DEPS_LIBS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
-librygel_renderer_2_0_la_LDFLAGS = \
+librygel_renderer_2_2_la_LDFLAGS = \
-version-info $(LIBRYGEL_RENDERER_VERSION)
vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
+vapi_DATA = rygel-renderer-2.2.vapi rygel-renderer-2.2.deps
-rygel-renderer.h rygel-renderer-2.0.vapi: librygel_renderer_2_0_la_vala.stamp
+rygel-renderer.h rygel-renderer-2.2.vapi: librygel_renderer_2_2_la_vala.stamp
-EXTRA_DIST = rygel-renderer.h rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
+EXTRA_DIST = rygel-renderer.h rygel-renderer-2.2.vapi rygel-renderer-2.2.deps
diff --git a/src/librygel-renderer/rygel-renderer-2.0.deps b/src/librygel-renderer/rygel-renderer-2.0.deps
deleted file mode 100644
index dd455301..00000000
--- a/src/librygel-renderer/rygel-renderer-2.0.deps
+++ /dev/null
@@ -1 +0,0 @@
-rygel-core-2.0
diff --git a/src/librygel-renderer/rygel-renderer-2.2.deps b/src/librygel-renderer/rygel-renderer-2.2.deps
new file mode 100644
index 00000000..8fec1aa8
--- /dev/null
+++ b/src/librygel-renderer/rygel-renderer-2.2.deps
@@ -0,0 +1 @@
+rygel-core-2.2
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index d083c95f..4781ef19 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -1,39 +1,39 @@
include $(top_srcdir)/common.am
include $(srcdir)/filelist.am
-librygel_server_includedir=$(includedir)/rygel-2.0
+librygel_server_includedir=$(includedir)/rygel-2.2
librygel_server_include_HEADERS = rygel-server.h
-lib_LTLIBRARIES = librygel-server-2.0.la
+lib_LTLIBRARIES = librygel-server-2.2.la
-LIBRYGEL_SERVER_VERSION=1:0:0
+LIBRYGEL_SERVER_VERSION=2:2:0
-librygel_server_2_0_la_SOURCES = \
+librygel_server_2_2_la_SOURCES = \
$(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
$(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
-librygel_server_2_0_la_VALAFLAGS = \
- -H rygel-server.h --library=rygel-server-2.0 \
+librygel_server_2_2_la_VALAFLAGS = \
+ -H rygel-server.h --library=rygel-server-2.2 \
$(LIBRYGEL_SERVER_DEPS_VALAFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
$(RYGEL_COMMON_VALAFLAGS)
-librygel_server_2_0_la_CFLAGS = \
+librygel_server_2_2_la_CFLAGS = \
$(LIBRYGEL_SERVER_DEPS_CFLAGS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
-DENGINE_DIR='"$(enginedir)"' \
-DG_LOG_DOMAIN=\"Rygel\"
-librygel_server_2_0_la_LIBADD = \
+librygel_server_2_2_la_LIBADD = \
$(LIBRYGEL_SERVER_DEPS_LIBS) \
$(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
-librygel_server_2_0_la_LDFLAGS = \
+librygel_server_2_2_la_LDFLAGS = \
$(RYGEL_DATA_DIR_DEFINES) \
-version-info $(LIBRYGEL_SERVER_VERSION)
vapidir = $(VAPIDIR)
-vapi_DATA = rygel-server-2.0.vapi rygel-server-2.0.deps
+vapi_DATA = rygel-server-2.2.vapi rygel-server-2.2.deps
-rygel-server.h rygel-server-2.0.vapi: librygel_server_2_0_la_vala.stamp
+rygel-server.h rygel-server-2.2.vapi: librygel_server_2_2_la_vala.stamp
-EXTRA_DIST = rygel-server.h rygel-server-2.0.vapi rygel-server-2.0.deps
+EXTRA_DIST = rygel-server.h rygel-server-2.2.vapi rygel-server-2.2.deps
diff --git a/src/librygel-server/rygel-server-2.0.deps b/src/librygel-server/rygel-server-2.2.deps
index ed05e345..86fd0222 100644
--- a/src/librygel-server/rygel-server-2.0.deps
+++ b/src/librygel-server/rygel-server-2.2.deps
@@ -1,5 +1,5 @@
gee-0.8
gupnp-1.0
gio-2.0
-rygel-core-2.0
+rygel-core-2.2
gupnp-av-1.0
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 265bee6d..be88fa7c 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -5,7 +5,7 @@ plugin_DATA = playbin.plugin
librygel_playbin_la_SOURCES = rygel-playbin-module.vala rygel-playbin-plugin.vala
librygel_playbin_la_VALAFLAGS = \
- --pkg rygel-renderer-gst-2.0 \
+ --pkg rygel-renderer-gst-2.2 \
--vapidir $(top_srcdir)/src/librygel-renderer-gst \
--enable-experimental \
$(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
View Lorry Controller Status