[rygel-gst-0-10-plugins] Get linker flags and installation dir from Rygel's pc files.
- From: Krzesimir Nowak <krnowak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-plugins] Get linker flags and installation dir from Rygel's pc files.
- Date: Tue, 12 Feb 2013 10:00:00 +0000 (UTC)
commit 15a8d611fb04329761a3fe4a696b1d239bb516ac
Author: Krzesimir Nowak <krnowak openismus com>
Date: Tue Feb 12 10:59:21 2013 +0100
Get linker flags and installation dir from Rygel's pc files.
configure.ac | 18 ++++++++++++++++++
src/media-export/Makefile.am | 8 ++------
2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fad3195..f7a11db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,24 @@ IT_PROG_INTLTOOL([0.40.0])
dnl Shave the output
AM_SILENT_RULES([yes])
+PKG_PROG_PKG_CONFIG
+
+RYGEL_PLUGIN_LINKER_FLAGS="`$PKG_CONFIG --variable=plugin_ldflags rygel-core-2.0`"
+AC_SUBST(RYGEL_PLUGIN_LINKER_FLAGS)
+
+if test "x$RYGEL_PLUGIN_LINKER_FLAGS" = 'x'
+then
+ AC_MSG_ERROR([Could not get Rygel plugin linker flags])
+fi
+
+RYGEL_PLUGIN_DIR="`$PKG_CONFIG --variable=plugindir rygel-core-2.0`"
+AC_SUBST(RYGEL_PLUGIN_DIR)
+
+if test "x$RYGEL_PLUGIN_DIR" = 'x'
+then
+ AC_MSG_ERROR([Could not get Rygel plugin installation directory])
+fi
+
AC_CONFIG_FILES([
Makefile
data/Makefile
diff --git a/src/media-export/Makefile.am b/src/media-export/Makefile.am
index a811079..44b5fc2 100644
--- a/src/media-export/Makefile.am
+++ b/src/media-export/Makefile.am
@@ -1,6 +1,5 @@
-# TODO: export this directory in some Rygel's pc file.
-exportdir = $(libdir)/rygel-2.0/plugins
-export_LTLIBRARIES = librygel-media-export-gst-0-10.la
+plugindir = $(RYGEL_PLUGIN_DIR)
+plugin_LTLIBRARIES = librygel-media-export-gst-0-10.la
librygel_media_export_gst_0_10_la_SOURCES = \
rygel-media-export-collate.c \
@@ -46,7 +45,4 @@ librygel_media_export_gst_0_10_la_LIBADD = \
$(DEPS_LIBS) \
$(COLLATION_LIBS)
-# TODO: export these flags in some Rygel's pc file.
-RYGEL_PLUGIN_LINKER_FLAGS = -shared -fPIC -module -avoid-version -Wl,-z,defs
-
librygel_media_export_gst_0_10_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]