aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-06-17 21:40:43 +0100
committerConor Curran <conor.curran@canonical.com>2010-06-17 21:40:43 +0100
commit9d081fd7a4c36606854008ae72c960d419399e9a (patch)
tree0649492be7fc0efd31a4591c7a6ea342c478db4b /src
parent007d3af477529ac3d4f645001815a73788e70fbe (diff)
parentf7d98d5d61055dbe05effdf35f600607203b7377 (diff)
downloadayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.tar.gz
ayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.tar.bz2
ayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.zip
merges of kens fixes
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ac7beb9..5a42dc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ libexec_PROGRAMS = indicator-sound-service
soundmenulibdir = $(INDICATORDIR)
soundmenulib_LTLIBRARIES = libsoundmenu.la
libsoundmenu_la_SOURCES = \
- common-defs.h \
+ common-defs.h \
indicator-sound.h \
transport-widget.c \
transport-widget.h \
@@ -105,8 +105,8 @@ indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_
EXTRA_DIST = \
sound-service.xml \
sound-service.list \
- $(music_bridge_la_APIFILES) \
- $(music_bridge_la_VALASOURCES)
+ $(music_bridge_APIFILES) \
+ $(music_bridge_VALASOURCES)
#######################
# Stuff to clean Stuff
@@ -115,8 +115,9 @@ BUILT_SOURCES = \
music_bridge_vala.stamp \
sound-service-client.h \
sound-service-server.h \
- $(music_bridge_la_APIFILES) \
- $(music_bridge_la_VALASOURCES:.vala=.c)
+ music-bridge.vapi \
+ $(music_bridge_APIFILES) \
+ $(music_bridge_VALASOURCES:.vala=.c)
CLEANFILES = \
$(BUILT_SOURCES)