[rygel-grilo] Fix dependencies

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit 25ebfddc544cb02cf94b5133e6427a8f2913702c
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Sun May 16 11:06:40 2010 +0000

    Fix dependencies
    
    Library does not need grilo dependency, so just add it rygel-grilo program.
    
    Get rid of other unneeded dependencies.

 configure.ac    |   12 +++++++-----
 src/Makefile.am |   17 ++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index daad055..9fe5d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,17 +48,19 @@ AM_CONDITIONAL([DEBUG], [test "x$enable_debug" = "xyes"])
 # DEPENDENCIES
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES(DEPS, glib-2.0	\
+PKG_CHECK_MODULES(DEPS, 		\
+			glib-2.0	\
 			gobject-2.0	\
-			gmodule-2.0	\
-			gio-2.0		\				
-			grilo-0.1	\
 			dbus-glib-1)
 
-
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
+PKG_CHECK_MODULES(GRL_DEP, grilo-0.1)
+
+AC_SUBST(GRL_DEP_CFLAGS)
+AC_SUBST(GRL_DEP_LIBS)
+
 # ----------------------------------------------------------
 # DBUS BINDING TOOL
 # ----------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 2012a8a..9b91306 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,15 +5,6 @@
 #
 # Copyright (C) 2010 Igalia S.L.
 
-INCLUDES = @DEPS_CFLAGS@
-
-rygel-grilo-%-glue.h: $(top_srcdir)/data/%1.xml
-	$(DBUSBINDINGTOOL)			\
-	--mode=glib-server			\
-	--output=$@				\
-	--prefix=rygel_grilo_$(subst -,_,$*)	\
-	$^
-
 bin_PROGRAMS = rygel-grilo test-client
 
 rygel_grilo_SOURCES =	\
@@ -21,25 +12,29 @@ rygel_grilo_SOURCES =	\
 
 
 rygel_grilo_CFLAGS =			\
+	$(DEPS_CFLAGS)			\
+	$(GRL_DEP_CFLAGS)		\
 	-DPREFIX=$(prefix)		\
 	-DSYSCONFDIR=\"$(sysconfdir)\"	\
         -I$(top_srcdir)/lib
 
 rygel_grilo_LDADD =	\
 	-ldl -lpthread	\
-	@DEPS_LIBS@	\
+	$(DEPS_LIBS)	\
+	$(GRL_DEP_LIBS)	\
 	$(top_builddir)/lib/libmediaserver1.la
 
 test_client_SOURCES =	\
 	test-client.c
 
 test_client_CFLAGS =		\
+	$(DEPS_CFLAGS)		\
 	-DPREFIX=$(prefix)	\
 	-I$(top_srcdir)/lib
 
 test_client_LDADD =	\
 	-ldl -lpthread	\
-	@DEPS_LIBS@	\
+	$(DEPS_LIBS)	\
 	$(top_builddir)/lib/libmediaserver1.la
 
 MAINTAINERCLEANFILES =	\