[rhythmbox/gobject-introspection: 7/39] update vala hackery for gir namespace merge

[Jonathan Matthew <jmatthew src gnome org>]

commit c74db1cd9696f7bc466c65791b4c4f6aca51f864
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Oct 28 10:14:06 2010 +1000

    update vala hackery for gir namespace merge

 bindings/vala/Makefile.am   |   16 ++++------------
 bindings/vala/rb.deps       |    1 -
 bindings/vala/rhythmdb.deps |    4 ----
 3 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 82cbf3b..f0ac8e3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -2,24 +2,16 @@ vapidir = $(VAPIDIR)
 
 vapi_DATA = 			\
 	rb.deps			\
-	rb.vapi			\
-	rhythmdb.deps		\
-	rhythmdb.vapi
+	rb.vapi
 
 VAPIGEN_PKG = --pkg atk --pkg gtk+-2.0 --pkg gdk-pixbuf-2.0 --pkg gstreamer-0.10 --pkg libxml-2.0
 
 RB-0.13.vala.gir: $(top_builddir)/bindings/gi/RB-0.13.gir
 	sed -e 's/libxml2.NodePtr/Xml.Node/' -e 's/GdkPixbuf.Pixbuf/Gdk.Pixbuf/' -e 's/libxml2.Char/utf8/' < $< > $  tmp
 	mv $  tmp $@
+# -e 's/<alias.*//'
 
-RhythmDB-0.13.vala.gir: $(top_builddir)/bindings/gi/RhythmDB-0.13.gir
-	sed -e 's/libxml2.NodePtr/Xml.Node/' -e 's/GdkPixbuf.Pixbuf/Gdk.Pixbuf/' -e 's/libxml2.Char/utf8/' -e 's/<alias.*//' < $< > $  tmp
-	mv $  tmp $@
-
-rhythmdb.vapi: RhythmDB-0.13.vala.gir
-	$(VAPIGEN) $(VAPIGEN_PKG) --library rhythmdb $<
-
-rb.vapi: RB-0.13.vala.gir rhythmdb.vapi
+rb.vapi: RB-0.13.vala.gir
 	$(VAPIGEN) $(VAPIGEN_PKG) --vapidir $(top_builddir)/bindings/vala --library rb $<
 
-CLEANFILES = rb.vapi rhythmdb.vapi RB-0.13.vala.gir RhythmDB-0.13.vala.gir
+CLEANFILES = rb.vapi RB-0.13.vala.gir
diff --git a/bindings/vala/rb.deps b/bindings/vala/rb.deps
index cbaaca8..0a43036 100644
--- a/bindings/vala/rb.deps
+++ b/bindings/vala/rb.deps
@@ -2,5 +2,4 @@ gtk+-2.0
 gdk-pixbuf-2.0
 libxml-2.0
 glib-2.0
-rhythmdb
 gstreamer-0.10