From 61cdd08c447d756b14a6208e9caaeba0be9ccb56 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Thu, 24 Jun 2010 10:37:46 +0100
Subject: fixes to top level Makefile.am

---
 Makefile.am     | 2 +-
 src/Makefile.am | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9f75289..466806a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = \
 	tests \
 	po
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh vapi/common-defs.vapi
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d2a82f6..8e7bc94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@ music_bridge_VALASOURCES = \
 music_bridge_VALAFLAGS = \
   --ccode \
   -H music-player-bridge.h -d . \
-  --library music-bridge \
   --vapidir=./ \
   --vapidir=$(top_srcdir)/vapi/ \
   --thread \
@@ -70,8 +69,7 @@ music_bridge_VALAFLAGS = \
   --pkg Indicate-0.2 \
   --pkg Dbusmenu-Glib-0.2 \
   --pkg common-defs \
-	--pkg dbus-glib-1
- 
+	--pkg dbus-glib-1 \
   $(MAINTAINER_VALAFLAGS)
 
 music_bridge_APIFILES = \
@@ -118,7 +116,6 @@ BUILT_SOURCES = \
 	music_bridge_vala.stamp \
 	sound-service-client.h \
   sound-service-server.h \
-  music-bridge.vapi \
   $(music_bridge_APIFILES) \
   $(music_bridge_VALASOURCES:.vala=.c)
 
-- 
cgit v1.2.3