rygel r294 - in trunk: . src/media-providers/tracker src/media-server

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Nov 25 14:43:18 2008
New Revision: 294
URL: http://svn.gnome.org/viewvc/rygel?rev=294&view=rev

Log:
Link against libgee.

Modified:
   trunk/configure.ac
   trunk/src/media-providers/tracker/Makefile.am
   trunk/src/media-server/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 25 14:43:18 2008
@@ -21,6 +21,7 @@
 DBUS_GLIB_REQUIRED=0.74
 GSTREAMER_REQUIRED=0.10.18
 GIO_REQUIRED=2.16
+GEE_REQUIRED=0.1.3
 
 PKG_CHECK_MODULES(VALA, [vala-1.0 >= $VALA_REQUIRED])
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
@@ -29,6 +30,7 @@
 PKG_CHECK_MODULES(LIBDBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(LIBGSTREAMER, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
 PKG_CHECK_MODULES(LIBGIO, gio-2.0 >= $GIO_REQUIRED)
+PKG_CHECK_MODULES(GEE, gee-1.0 >= $GEE_REQUIRED)
 
 # Vala compiler
 # This is more to get the path of the compiler since the pkg-config check
@@ -66,6 +68,10 @@
         true,
         [AC_MSG_ERROR("Unable to find Vala bindings for gio-2.0")])
 
+AC_CHECK_FILE("${VAPIDIR}/gee-1.0.vapi",
+        true,
+        [AC_MSG_ERROR("Unable to find Vala bindings for gee-1.0")])
+
 # glib-genmarshal
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)

Modified: trunk/src/media-providers/tracker/Makefile.am
==============================================================================
--- trunk/src/media-providers/tracker/Makefile.am	(original)
+++ trunk/src/media-providers/tracker/Makefile.am	Tue Nov 25 14:43:18 2008
@@ -5,6 +5,7 @@
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGUPNP_AV_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
+	    $(GEE_CFLAGS) \
 	    -I$(top_srcdir)/src/media-server
 
 BUILT_SOURCES = rygel-media-tracker.stamp \
@@ -48,12 +49,13 @@
 rygel-media-tracker.stamp: $(filter %.vala,$(librygel_media_tracker_la_SOURCES))
 	$(VALAC) -C --vapidir=$(top_srcdir)/src/media-server \
 	--pkg rygel-1.0 \
-	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 $^
+	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gee-1.0 $^
 	touch $@
 
 librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
 			       	   $(LIBGUPNP_AV_LIBS) \
-				   $(LIBDBUS_GLIB_LIBS)
+				   $(LIBDBUS_GLIB_LIBS) \
+				   $(GEE_LIBS)
 librygel_media_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = $(BUILT_SOURCES)

Modified: trunk/src/media-server/Makefile.am
==============================================================================
--- trunk/src/media-server/Makefile.am	(original)
+++ trunk/src/media-server/Makefile.am	Tue Nov 25 14:43:18 2008
@@ -15,6 +15,7 @@
 	    $(LIBGCONF_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
 	    $(GIO_CFLAGS) \
+	    $(GEE_CFLAGS) \
 	    -I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' \
 	    -DPLUGIN_DIR='"$(plugindir)"'
 
@@ -85,14 +86,15 @@
 rygel.stamp: $(filter %.vala,$(rygel_SOURCES))
 	$(VALAC) -C --vapidir=$(srcdir) --pkg rygel-1.0 \
 	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-	--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 $^
+	--pkg gconf-2.0 --pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 $^
 	touch $@
 
 rygel_LDADD = $(LIBGUPNP_LIBS) \
 	      $(LIBGUPNP_AV_LIBS) \
 	      $(LIBGCONF_LIBS) \
 	      $(LIBGSTREAMER_LIBS) \
-	      $(GIO_LIBS)
+	      $(GIO_LIBS) \
+	      $(GEE_LIBS)
 rygel_LDFLAGS = -export-dynamic
 
 VAPI_FILES = rygel-1.0.vapi
@@ -106,7 +108,7 @@
 		rygel-media-container.vala \
 		rygel-media-item.vala
 	$(VALAC) -C --library=rygel-1.0 \
-	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
+	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0 \
 	$^
 
 CLEANFILES = $(BUILT_SOURCES)