diff options
| author | Jens Georg <mail@jensge.org> | 2017-05-01 11:08:15 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2017-05-01 11:26:14 +0200 |
| commit | 48d92ffc0f61d353dba1be6e0aebcc04184dd67d (patch) | |
| tree | acdeec53c544999231e14c22ba49c6b2ee2309cb | |
| parent | d9e3d3eb0357b9bdd8bd6e692d94eddfd98acd2b (diff) | |
| download | rygel-48d92ffc0f61d353dba1be6e0aebcc04184dd67d.tar.gz | |
build: Fix build issues with latest Yocto
| -rw-r--r-- | common.am | 17 | ||||
| -rw-r--r-- | src/librygel-core/Makefile.am | 2 | ||||
| -rw-r--r-- | src/plugins/playbin/Makefile.am | 5 | ||||
| -rw-r--r-- | src/plugins/ruih/Makefile.am | 2 |
4 files changed, 11 insertions, 15 deletions
@@ -23,10 +23,10 @@ endif smallicondir = $(shareddir)/icons/48x48 bigicondir = $(shareddir)/icons/120x120 -librygelcoredir = $(top_srcdir)/src/librygel-core -librygelserverdir = $(top_srcdir)/src/librygel-server -librygelrendererdir = $(top_srcdir)/src/librygel-renderer -librygelruihdir = $(top_srcdir)/src/librygel-ruih +librygelcoredir = $(abs_top_srcdir)/src/librygel-core +librygelserverdir = $(abs_top_srcdir)/src/librygel-server +librygelrendererdir = $(abs_top_srcdir)/src/librygel-renderer +librygelruihdir = $(abs_top_srcdir)/src/librygel-ruih MAINTAINERCLEANFILES = Makefile.in @@ -48,7 +48,7 @@ RYGEL_COMMON_LIBRYGEL_CORE_LIBS = \ $(top_builddir)/src/librygel-core/librygel-core-2.6.la RYGEL_COMMON_LIBRYGEL_DB_VALAFLAGS = \ - --vapidir=$(top_srcdir)/src/librygel-db \ + --vapidir=$(abs_top_srcdir)/src/librygel-db \ --pkg rygel-db-2.6 \ $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) @@ -62,7 +62,7 @@ RYGEL_COMMON_LIBRYGEL_DB_LIBS = \ $(top_builddir)/src/librygel-db/librygel-db-2.6.la RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS = \ - --vapidir=$(top_srcdir)/src/librygel-renderer \ + --vapidir=$(abs_top_srcdir)/src/librygel-renderer \ --pkg rygel-renderer-2.6 \ $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) @@ -77,8 +77,9 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS = \ RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS = \ - --vapidir=$(top_srcdir)/src/librygel-renderer-gst \ + --vapidir=$(abs_top_srcdir)/src/librygel-renderer-gst \ --pkg rygel-renderer-gst-2.6 \ + --enable-experimental \ $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \ @@ -106,7 +107,7 @@ RYGEL_COMMON_LIBRYGEL_SERVER_LIBS = \ $(top_builddir)/src/librygel-server/librygel-server-2.6.la RYGEL_COMMON_LIBRYGEL_RUIH_VALAFLAGS = \ - --vapidir=$(top_builddir)/src/librygel-ruih \ + --vapidir=$(abs_top_srcdir)/src/librygel-ruih \ --pkg rygel-ruih-2.0 \ $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am index c6cb71c2..e90c54f2 100644 --- a/src/librygel-core/Makefile.am +++ b/src/librygel-core/Makefile.am @@ -14,7 +14,7 @@ librygel_core_2_6_la_SOURCES = \ librygel_core_2_6_la_VALAFLAGS = \ -H rygel-core.h -C --library=rygel-core-2.6 \ --gir=Rygel-2.6.gir \ - --vapidir=$(srcdir) \ + --vapidir=$(abs_srcdir) \ $(LIBRYGEL_CORE_DEPS_VALAFLAGS) \ $(RYGEL_COMMON_VALAFLAGS) diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am index aca75721..22faaf77 100644 --- a/src/plugins/playbin/Makefile.am +++ b/src/plugins/playbin/Makefile.am @@ -5,10 +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.6 \ - --vapidir $(top_srcdir)/src/librygel-renderer-gst \ - --enable-experimental \ - $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS) \ $(RYGEL_COMMON_VALAFLAGS) librygel_playbin_la_CFLAGS = \ $(RYGEL_PLUGIN_PLAYBIN_DEPS_CFLAGS) \ diff --git a/src/plugins/ruih/Makefile.am b/src/plugins/ruih/Makefile.am index aa2f654d..25ac4441 100644 --- a/src/plugins/ruih/Makefile.am +++ b/src/plugins/ruih/Makefile.am @@ -5,8 +5,6 @@ plugin_DATA = ruih.plugin librygel_ruih_la_SOURCES = rygel-ruih-module.vala rygel-ruih-plugin.vala librygel_ruih_la_VALAFLAGS = \ - --pkg rygel-ruih-2.0 \ - --vapidir $(top_srcdir)/src/librygel-ruih \ $(RYGEL_COMMON_LIBRYGEL_RUIH_VALAFLAGS) \ $(RYGEL_COMMON_VALAFLAGS) librygel_ruih_la_CFLAGS = \ |