diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 45 | ||||
| -rw-r--r-- | examples/renderer-plugins/C/Makefile.am | 21 | ||||
| -rw-r--r-- | examples/renderer-plugins/vala/Makefile.am | 14 | ||||
| -rw-r--r-- | examples/server-plugins/C/Makefile.am | 18 | ||||
| -rw-r--r-- | examples/server-plugins/vala/Makefile.am | 13 |
5 files changed, 49 insertions, 62 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index ac397537..1182364c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -10,46 +10,41 @@ SUBDIRS = $(EXAMPLE_PLUGINS) include ../common.am -AM_CFLAGS += \ - -I$(top_builddir)/src/librygel-server \ - -I$(top_srcdir)/src/librygel-server \ - -I$(top_builddir)/src/rygel \ - -I$(top_srcdir)/src/rygel +#TODO: Remove the src/rygel from here? noinst_PROGRAMS = standalone-server standalone_server_SOURCES = standalone-server.c +standalone_server_CFLAGS = \ + $(EXAMPLE_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS) standalone_server_LDADD = \ - $(top_builddir)/src/librygel-server/librygel-server-2.0.la \ - $(LIBGIO_LIBS) \ - $(RYGEL_COMMON_LIBS) + $(EXAMPLE_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) if HAVE_GSTREAMER -AM_CFLAGS += \ - -I$(top_builddir)/src/librygel-renderer-gst \ - -I$(top_srcdir)/src/librygel-renderer-gst \ - -I$(top_builddir)/src/librygel-renderer \ - -I$(top_srcdir)/src/librygel-renderer \ - $(LIBGSTREAMER_CFLAGS) noinst_PROGRAMS += standalone-renderer-gst standalone_renderer_gst_SOURCES = standalone-renderer-gst.c +standalone_renderer_gst_CFLAGS = \ + $(EXAMPLE_DEPS_CFLAGS) \ + $(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS) standalone_renderer_gst_LDADD = \ - $(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la \ - $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la \ - $(LIBGSTREAMER_LIBS) \ - $(RYGEL_COMMON_LIBS) + $(EXAMPLE_DEPS_LIBS) \ + $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_LIBS) if BUILD_UI noinst_PROGRAMS += fullscreen-renderer fullscreen_renderer_SOURCES = fullscreen-renderer.c -fullscreen_renderer_CFLAGS = $(AM_CFLAGS) $(GTK_CFLAGS) +fullscreen_renderer_CFLAGS = \ + $(EXAMPLE_UI_DEPS_CFLAGS) \ + $(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS) fullscreen_renderer_LDADD = \ - $(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la \ - $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la \ - $(LIBGSTREAMER_LIBS) \ - $(RYGEL_COMMON_LIBS) \ - $(GTK_LIBS) \ - $(GST_VIDEO_LIBS) + $(EXAMPLE_UI_DEPS_LIBS) \ + $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_LIBS) endif endif diff --git a/examples/renderer-plugins/C/Makefile.am b/examples/renderer-plugins/C/Makefile.am index ae34783f..be7685ce 100644 --- a/examples/renderer-plugins/C/Makefile.am +++ b/examples/renderer-plugins/C/Makefile.am @@ -2,31 +2,22 @@ include $(top_srcdir)/common.am plugin_LTLIBRARIES = librygel-example-renderer-plugin-c.la -AM_CFLAGS += -DG_LOG_DOMAIN='"ExampleRendererPluginC"' - librygel_example_renderer_plugin_c_la_SOURCES = \ example-renderer-plugin.h \ example-renderer-plugin.h \ example-player.h \ example-player.c -# You would ususally just use pkg-config: -librygel_core_includes = -I$(top_builddir)/src/librygel-core $(if $(srcdir:.=),-I$(top_srcdir)/src/librygel-core) -librygel_renderer_includes = -I$(top_builddir)/src/librygel-renderer $(if $(srcdir:.=),-I$(top_srcdir)/src/librygel-renderer) - # TODO: Do we need all these? librygel_example_renderer_plugin_c_la_CFLAGS = \ - $(LIBGSTREAMER_CFLAGS) \ - $(LIBGUPNP_CFLAGS) \ - $(LIBGUPNP_AV_CFLAGS) \ - $(GEE_CFLAGS) \ - $(librygel_core_includes) \ - $(librygel_renderer_includes) + $(EXAMPLE_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS) \ + -DG_LOG_DOMAIN='"ExampleRendererPluginC"' librygel_example_renderer_plugin_c_la_LIBADD = \ - $(LIBGSTREAMER_LIBS) \ - $(RYGEL_COMMON_RENDERER_LIBS) + $(EXAMPLE_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) librygel_example_renderer_plugin_c_la_LDFLAGS = \ - $(RYGEL_PLUGIN_LINKER_FLAGS) + $(RYGEL_PLUGIN_LINKER_FLAGS) diff --git a/examples/renderer-plugins/vala/Makefile.am b/examples/renderer-plugins/vala/Makefile.am index 1a2a77c8..2aa2b8df 100644 --- a/examples/renderer-plugins/vala/Makefile.am +++ b/examples/renderer-plugins/vala/Makefile.am @@ -2,17 +2,21 @@ include $(top_srcdir)/common.am plugin_LTLIBRARIES = librygel-example-renderer-plugin-vala.la -AM_CFLAGS += -DG_LOG_DOMAIN='"ExampleRendererPluginVala"' - librygel_example_renderer_plugin_vala_la_SOURCES = \ example-renderer-plugin-vala.vala \ example-player-vala.vala librygel_example_renderer_plugin_vala_la_VALAFLAGS = \ - $(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS) + $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \ + $(RYGEL_COMMON_VALAFLAGS) +librygel_example_renderer_plugin_vala_la_CFLAGS = \ + $(EXAMPLE_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS) \ + -DG_LOG_DOMAIN='"ExampleRendererPluginVala"' librygel_example_renderer_plugin_vala_la_LIBADD = \ - $(RYGEL_COMMON_RENDERER_LIBS) + $(EXAMPLE_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) librygel_example_renderer_plugin_vala_la_LDFLAGS = \ - $(RYGEL_PLUGIN_LINKER_FLAGS) + $(RYGEL_PLUGIN_LINKER_FLAGS) diff --git a/examples/server-plugins/C/Makefile.am b/examples/server-plugins/C/Makefile.am index 2424f554..f9230f78 100644 --- a/examples/server-plugins/C/Makefile.am +++ b/examples/server-plugins/C/Makefile.am @@ -2,28 +2,20 @@ include $(top_srcdir)/common.am plugin_LTLIBRARIES = librygel-example-server-plugin-c.la -AM_CFLAGS += -DG_LOG_DOMAIN='"ExampleServerPluginC"' - librygel_example_server_plugin_c_la_SOURCES = \ example-server-plugin.h \ example-server-plugin.c \ example-root-container.h \ example-root-container.c -# You would ususally just use pkg-config: -librygel_core_includes = -I$(top_builddir)/src/librygel-core $(if $(srcdir:.=),-I$(top_srcdir)/src/librygel-core) -librygel_server_includes = -I$(top_builddir)/src/librygel-server $(if $(srcdir:.=),-I$(top_srcdir)/src/librygel-server) - librygel_example_server_plugin_c_la_CFLAGS = \ - $(LIBGSTREAMER_CFLAGS) \ - $(LIBGUPNP_CFLAGS) \ - $(LIBGUPNP_AV_CFLAGS) \ - $(GEE_CFLAGS) \ - $(librygel_core_includes) \ - $(librygel_server_includes) + $(EXAMPLE_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS) \ + -DG_LOG_DOMAIN='"ExampleServerPluginC"' librygel_example_server_plugin_c_la_LIBADD = \ - $(LIBGSTREAMER_LIBS) \ + $(EXAMPLE_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \ $(RYGEL_COMMON_SERVER_LIBS) librygel_example_server_plugin_c_la_LDFLAGS = \ diff --git a/examples/server-plugins/vala/Makefile.am b/examples/server-plugins/vala/Makefile.am index 2001ac41..7c82b3cd 100644 --- a/examples/server-plugins/vala/Makefile.am +++ b/examples/server-plugins/vala/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/common.am plugin_LTLIBRARIES = librygel-example-server-plugin-vala.la -AM_CFLAGS += -DG_LOG_DOMAIN='"ExampleServerPluginVala"' - # Note that we must have these Vala prefixes on the # class names (and therefore on the file names) # to avoid conflicts with other plugins. @@ -12,10 +10,17 @@ librygel_example_server_plugin_vala_la_SOURCES = \ example-root-container-vala.vala librygel_example_server_plugin_vala_la_VALAFLAGS = \ - $(RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS) + $(RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS) \ + $(RYGEL_COMMON_VALAFLAGS) + +librygel_example_server_plugin_vala_la_CFLAGS = \ + $(EXAMPLE_DEPS_CFLAGS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS) \ + -DG_LOG_DOMAIN='"ExampleServerPluginVala"' librygel_example_server_plugin_vala_la_LIBADD = \ - $(RYGEL_COMMON_SERVER_LIBS) + $(EXAMPLE_DEPS_LIBS) \ + $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) librygel_example_server_plugin_vala_la_LDFLAGS = \ $(RYGEL_PLUGIN_LINKER_FLAGS) |