[rygel] Export useful data for plugins in pc files.



commit fd37212895db8188f4026c9ddff018f68f1f5744
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Tue Feb 12 10:17:19 2013 +0100

    Export useful data for plugins in pc files.

 common.am              |    6 ++----
 configure.ac           |    7 +++++++
 rygel-core-2.0.pc.in   |    3 +++
 rygel-server-2.0.pc.in |    2 ++
 4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/common.am b/common.am
index 5d3f697..066fa52 100644
--- 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
@@ -105,7 +105,5 @@ RYGEL_COMMON_VALAFLAGS = \
 	$(COVERAGE_VALAFLAGS)
 
 
-RYGEL_PLUGIN_LINKER_FLAGS = -shared -fPIC -module -avoid-version -Wl,-z,defs
-
 vala-clean:
 	rm -f `find . -name "*.stamp"`
diff --git a/configure.ac b/configure.ac
index 11a341a..3e89af3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,13 @@ AS_IF([test "x$enable_valadoc" != "xno"], [
 
 AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
 
+AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
+         ["-shared -fPIC -module -avoid-version -Wl,-z,defs"])
+AC_SUBST([RYGEL_PLUGIN_DIR],
+         [${libdir}/rygel-2.0/plugins])
+AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
+         [${libdir}/rygel-2.0/engines])
+
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
diff --git a/rygel-core-2.0.pc.in b/rygel-core-2.0.pc.in
index 5017ce2..6bdbae3 100644
--- a/rygel-core-2.0.pc.in
+++ b/rygel-core-2.0.pc.in
@@ -3,6 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
+plugindir= RYGEL_PLUGIN_DIR@
+plugin_ldflags= RYGEL_PLUGIN_LINKER_FLAGS@
+
 Name: rygel-core-2.0
 Description: GNOME (Mobile) UPnP/DLNA Media Server
 Version: @VERSION@
diff --git a/rygel-server-2.0.pc.in b/rygel-server-2.0.pc.in
index 29a5455..97c9bef 100644
--- a/rygel-server-2.0.pc.in
+++ b/rygel-server-2.0.pc.in
@@ -3,6 +3,8 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
+enginedir= RYGEL_MEDIA_ENGINE_DIR@
+
 Name: rygel-server-2.0
 Description: GNOME (Mobile) UPnP/DLNA Media server library
 Version: @VERSION@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]