ayatana-commits team mailing list archive

[Conor Curran <conor.curran@xxxxxxxxxxxxx>]

Conor Curran has proposed merging lp:~cjcurran/indicator-sound/more-distcheckfixes into lp:indicator-sound.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

-- 
https://code.launchpad.net/~cjcurran/indicator-sound/more-distcheckfixes/+merge/28379
Your team ayatana-commits is subscribed to branch lp:indicator-sound.

=== modified file 'Makefile.am'
--- Makefile.am	2010-03-04 10:23:40 +0000
+++ Makefile.am	2010-06-24 09:42:27 +0000
@@ -5,7 +5,7 @@
 	tests \
 	po
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh vapi/common-defs.vapi
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-06-22 16:58:21 +0000
+++ src/Makefile.am	2010-06-24 09:42:27 +0000
@@ -62,7 +62,6 @@
 music_bridge_VALAFLAGS = \
   --ccode \
   -H music-player-bridge.h -d . \
-  --library music-bridge \
   --vapidir=./ \
   --vapidir=$(top_srcdir)/vapi/ \
   --thread \
@@ -70,8 +69,7 @@
   --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 @@
 	music_bridge_vala.stamp \
 	sound-service-client.h \
   sound-service-server.h \
-  music-bridge.vapi \
   $(music_bridge_APIFILES) \
   $(music_bridge_VALASOURCES:.vala=.c)