media-export: Disable Artist/All container

[profile/ivi/rygel.git] / common.am

diff --git a/common.am b/common.am
index 42332a4..2945d89 100644 (file)
--- a/common.am
+++ b/common.am
@@ -14,8 +14,8 @@ else
 shareddir = $(datadir)/rygel
 sysconfigdir = $(sysconfdir)
 desktopdir = $(datadir)/applications
-plugindir = $(libdir)/rygel-2.0/plugins
-enginedir = $(libdir)/rygel-2.0/engines
+plugindir = @RYGEL_PLUGIN_DIR@
+enginedir = @RYGEL_MEDIA_ENGINE_DIR@
 icondir = $(datadir)/icons/hicolor/32x32/apps
 presetdir = $(shareddir)/presets
 endif
@@ -36,7 +36,7 @@ RYGEL_COMMON_DEFINES_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS = \
        --vapidir=$(librygelcoredir) \
-       --pkg rygel-core-2.0 \
+       --pkg rygel-core-2.2 \
        --pkg uuid
 
 RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS = \
@@ -45,12 +45,12 @@ RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS = \
        -I$(top_srcdir)/src/librygel-core
 
 RYGEL_COMMON_LIBRYGEL_CORE_LIBS = \
-       $(top_builddir)/src/librygel-core/librygel-core-2.0.la
+       $(top_builddir)/src/librygel-core/librygel-core-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS = \
-       --vapidir=$(top_builddir)/src/librygel-renderer \
-       --pkg rygel-renderer-2.0 \
+       --vapidir=$(top_srcdir)/src/librygel-renderer \
+       --pkg rygel-renderer-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
@@ -60,12 +60,12 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la
+       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS = \
-       --vapidir=$(top_builddir)/src/librygel-renderer-gst \
-       --pkg rygel-renderer-gst-2.0 \
+       --vapidir=$(top_srcdir)/src/librygel-renderer-gst \
+       --pkg rygel-renderer-gst-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
@@ -75,12 +75,12 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) \
-       $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la
+       $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS = \
        --vapidir=$(top_builddir)/src/librygel-server \
-       --pkg rygel-server-2.0 \
+       --pkg rygel-server-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
@@ -90,7 +90,7 @@ RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_SERVER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-server/librygel-server-2.0.la
+       $(top_builddir)/src/librygel-server/librygel-server-2.2.la
 
 RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS = \
        --vapidir=$(librygelcoredir) \
@@ -99,13 +99,11 @@ RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS = \
 # Note: This must always be the last one in *_VALAFLAGS,
 # because the -g needs to be at the end of VALAFLAGS to not break make dist.
 RYGEL_COMMON_VALAFLAGS = \
-       $(RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS)
+       $(RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS_PKG) \
-       $(RYGEL_DEBUG_VALAFLAGS) \
-       $(COVERAGE_VALAFLAGS)
+       $(COVERAGE_VALAFLAGS) \
+       $(RYGEL_DEBUG_VALAFLAGS)
 
 
-RYGEL_PLUGIN_LINKER_FLAGS = -shared -fPIC -module -avoid-version
-
 vala-clean:
        rm -f `find . -name "*.stamp"`