summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2011-03-22 16:11:49 +0200
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>2011-03-26 16:05:12 +0200
commit5e8cf627ea7c184a99d1607339dac90f3e32de72 (patch)
tree1498ab25e8b90054bbbb070f96883a5488b8d4f9
parent0495569c3b71dc8e5ac97907a8a311fb426d20b6 (diff)
downloadrygel-5e8cf627ea7c184a99d1607339dac90f3e32de72.tar.gz
build: Require & link against gst-plugins-base
-rw-r--r--common.am2
-rw-r--r--configure.ac1
-rw-r--r--src/rygel/Makefile.am1
-rw-r--r--tests/Makefile.am4
4 files changed, 7 insertions, 1 deletions
diff --git a/common.am b/common.am
index 8b5c8553..695a933a 100644
--- a/common.am
+++ b/common.am
@@ -24,6 +24,7 @@ AM_CFLAGS = \
$(LIBGUPNP_CFLAGS) \
$(LIBGUPNP_AV_CFLAGS) \
$(LIBGSTREAMER_CFLAGS) \
+ $(GSTREAMER_BASE_CFLAGS) \
$(GEE_CFLAGS) \
$(UUID_CFLAGS) \
-I$(rygeldir) \
@@ -35,6 +36,7 @@ RYGEL_COMMON_LDADD = \
$(LIBGUPNP_LIBS) \
$(LIBGUPNP_AV_LIBS) \
$(LIBGSTREAMER_LIBS) \
+ $(GSTREAMER_BASE_LIBS) \
$(GEE_LIBS) \
$(UUID_LIBS)
diff --git a/configure.ac b/configure.ac
index 8fa65964..75b1e81b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,7 @@ PKG_CHECK_MODULES(LIBGUPNP_AV, gupnp-av-1.0 >= $GUPNP_AV_REQUIRED
PKG_CHECK_MODULES(LIBGUPNP_DLNA, gupnp-dlna-1.0 >= $GUPNP_DLNA_REQUIRED
gupnp-dlna-1.0 <= $GUPNP_DLNA_MAX_VERSION)
PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
+PKG_CHECK_MODULES(GSTREAMER_BASE, gstreamer-base-0.10 >= $GSTREAMER_REQUIRED)
PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
PKG_CHECK_MODULES(UUID, uuid >= $UUID_REQUIRED)
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index a55788ce..19a126c6 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -114,6 +114,7 @@ rygel_VALAFLAGS = \
-H rygel.h -C --library=rygel-1.0 \
--pkg rygel-misc \
--pkg gstreamer-0.10 \
+ --pkg gstreamer-base-0.10 \
--pkg gupnp-dlna-1.0 \
--pkg posix \
$(RYGEL_COMMON_VALAFLAGS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 383768fa..0577d8ec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ shareddir = $(abs_top_builddir)/data
AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
$(LIBGUPNP_AV_CFLAGS) \
$(LIBGSTREAMER_CFLAGS) \
+ $(GSTREAMER_BASE_CFLAGS) \
$(GIO_CFLAGS) \
$(GEE_CFLAGS) \
$(UUID_CFLAGS) \
@@ -13,6 +14,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
LDADD = $(LIBGUPNP_LIBS) \
$(LIBGUPNP_AV_LIBS) \
$(LIBGSTREAMER_LIBS) \
+ $(GSTREAMER_BASE_LIBS) \
$(GIO_LIBS) \
$(GEE_LIBS) \
$(UUID_LIBS) \
@@ -20,7 +22,7 @@ LDADD = $(LIBGUPNP_LIBS) \
AM_VALAFLAGS = --disable-warnings --thread \
--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
- --pkg gconf-2.0 --pkg gstreamer-0.10 \
+ --pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gstreamer-base-0.10 \
--pkg gio-2.0 --pkg gee-1.0 -g
check_PROGRAMS = rygel-http-item-uri-test \