diff options
| author | Jens Georg <jensg@openismus.org> | 2012-09-12 14:25:24 +0200 |
|---|---|---|
| committer | Jens Georg <jensg@openismus.com> | 2012-10-05 17:33:28 +0200 |
| commit | 21af74d799944290f9faaef744f71a1450b40320 (patch) | |
| tree | 5a6924525d55cff7831b98b99ca97331d291991c /common.am | |
| parent | 3c11305e5bed40b3e6edff7229bec471fe22a3ae (diff) | |
| download | rygel-21af74d799944290f9faaef744f71a1450b40320.tar.gz | |
server,engine: Move MediaEngine into .so
Diffstat (limited to 'common.am')
| -rw-r--r-- | common.am | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -3,6 +3,7 @@ shareddir = $(abs_top_builddir)/data sysconfigdir = $(shareddir) desktopdir = $(shareddir) plugindir = $(abs_top_builddir)/src/plugins +enginedir = $(abs_top_builddir)/src/media-engines icondir = $(shareddir)/icons/32x32 presetdir = $(shareddir)/presets @@ -13,7 +14,8 @@ else shareddir = $(datadir)/rygel sysconfigdir = $(sysconfdir) desktopdir = $(datadir)/applications -plugindir = $(libdir)/rygel-1.0 +plugindir = $(libdir)/rygel-1.0/plugins +enginedir = $(libdir)/rygel-1.0/engines icondir = $(datadir)/icons/hicolor/32x32/apps presetdir = $(shareddir)/presets endif @@ -31,8 +33,6 @@ MAINTAINERCLEANFILES = Makefile.in AM_CFLAGS = \ $(LIBGUPNP_CFLAGS) \ $(LIBGUPNP_AV_CFLAGS) \ - $(LIBGSTREAMER_CFLAGS) \ - $(GSTREAMER_BASE_CFLAGS) \ $(GEE_CFLAGS) \ $(UUID_CFLAGS) \ $(COVERAGE_CFLAGS) \ @@ -42,14 +42,12 @@ AM_CFLAGS = \ -I$(librygelrendererdir) \ -DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\ -DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\ - -DPRESET_DIR='"$(presetdir)"'\ + -DPRESET_DIR='"$(presetdir)"' -DENGINE_DIR='"$(enginedir)"' \ -include config.h RYGEL_BASE_LIBS = \ $(LIBGUPNP_LIBS) \ $(LIBGUPNP_AV_LIBS) \ - $(LIBGSTREAMER_LIBS) \ - $(GSTREAMER_BASE_LIBS) \ $(GEE_LIBS) \ $(UUID_LIBS) \ $(COVERAGE_LIBS) @@ -66,6 +64,7 @@ RYGEL_COMMON_SERVER_LIBS = \ RYGEL_COMMON_RENDERER_LIBS = \ $(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \ + $(LIBGSTREAMER_LIBS) $(RYGEL_COMMON_LIBS) # Note: the -g needs to be at the end of VALAFLAGS to not break make dist |