[grilo] build: fix grilo-net building

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

commit 6bbf66e58fabfedadd75203e864c438594a9a7be
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Oct 18 18:03:17 2010 +0200

    build: fix grilo-net building
    
    If grilo-net dependencies are not found, it were still trying to build
    grilo-net.
    
    This patch fixes this problem.
    
    Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>

 Makefile.am               |    8 +++++---
 bindings/vala/Makefile.am |    7 ++++++-
 libs/Makefile.am          |   14 +++++++++++++-
 libs/net/Makefile.am      |    2 --
 4 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2682e61..7b245bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,11 @@ SUBDIRS += doc
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 	\
-	grilo-0.1.pc	\
-	grilo-net-0.1.pc
+pkgconfig_DATA = grilo-0.1.pc
+
+if BUILD_GRILO_NET
+pkgconfig_DATA += grilo-net-0.1.pc
+endif
 
 MAINTAINERCLEANFILES = \
         aclocal.m4 \
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 0fe742c..d98dec9 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -33,7 +33,12 @@
 # with distcheck).
 #
 
-targets = grilo- GRL_MAJORMINOR@ grilo-net- GRL_MAJORMINOR@
+targets = grilo- GRL_MAJORMINOR@
+
+if BUILD_GRILO_NET
+targets += grilo-net- GRL_MAJORMINOR@
+endif
+
 targets_u = $(foreach target,$(targets),$(subst @GRL_MAJORMINOR@,uninstalled,$(target)))
 
 # "source" files for vala-gen-introspect
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 0991d18..4f4da5f 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -5,4 +5,16 @@
 #
 # Copyright (C) 2010 Igalia S.L. All rights reserved.
 
-SUBDIRS = net
+SUBDIRS =
+
+if BUILD_GRILO_NET
+SUBDIRS += net
+endif
+
+DIST_SUBDIRS = net
+
+MAINTAINERCLEANFILES = \
+	*.in \
+	*~
+
+DISTCLEANFILES =$(MAINTAINERCLEANFILES)
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
index 10e4a5f..8009653 100644
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@@ -5,10 +5,8 @@
 #
 # Copyright (C) 2010 Igalia S.L. All rights reserved.
 
-if BUILD_GRILO_NET
 lib_LTLIBRARIES = libgrlnet- GRL_MAJORMINOR@.la
 noinst_PROGRAMS = wc-test
-endif
 
 libgrlnet_ GRL_MAJORMINOR@_la_DEPENDENCIES =	\
 	$(top_builddir)/src/lib GRL_NAME@.la