[rhythmbox] attempt to make the sample vala plugin build properly

[Jonathan Matthew <jmatthew src gnome org>]

commit 73fdded826e964d05af5579c7ac9715e8debb98c
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Aug 21 23:25:24 2009 +1000

    attempt to make the sample vala plugin build properly

 plugins/sample-vala/Makefile.am |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/plugins/sample-vala/Makefile.am b/plugins/sample-vala/Makefile.am
index ab94d4d..80b2ceb 100644
--- a/plugins/sample-vala/Makefile.am
+++ b/plugins/sample-vala/Makefile.am
@@ -1,16 +1,14 @@
 plugindir = $(PLUGINDIR)/sample-vala
-#plugin_LTLIBRARIES = libsample-vala.la
-noinst_LTLIBRARIES = libsample-vala.la
-
-nodist_libsample_vala_la_SOURCES = \
-	rb-sample-vala-plugin.c				\
-	rb-sample-vala-plugin.h
+plugin_LTLIBRARIES = libsample-vala.la
+#noinst_LTLIBRARIES = libsample-vala.la
 
 libsample_vala_la_SOURCES = \
 	rb-sample-vala-plugin.vala
 	
 libsample_vala_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsample_vala_la_LIBTOOLFLAGS = --tag=disable-static
+
+# this causes automake to barf confusingly
+# libsample_vala_la_LIBTOOLFLAGS = --tag=disable-static
 
 libsample_vala_la_CFLAGS = $(WNOERROR_CFLAGS)
 
@@ -39,8 +37,10 @@ plugin_in_files = sample-vala.rb-plugin.in
 
 %.rb-plugin: %.rb-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po); $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
+VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb
+
 %.c %.h: %.vala
-	$(VALAC) -C --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb $^
+	$(VALAC) -C $(VALAFLAGS) $^
 	
 # plugin_DATA = $(plugin_in_files:.rb-plugin.in=.rb-plugin)