diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-06-17 21:40:43 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-06-17 21:40:43 +0100 |
| commit | 9d081fd7a4c36606854008ae72c960d419399e9a (patch) | |
| tree | 0649492be7fc0efd31a4591c7a6ea342c478db4b | |
| parent | 007d3af477529ac3d4f645001815a73788e70fbe (diff) | |
| parent | f7d98d5d61055dbe05effdf35f600607203b7377 (diff) | |
| download | ayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.tar.gz ayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.tar.bz2 ayatana-indicator-sound-9d081fd7a4c36606854008ae72c960d419399e9a.zip | |
merges of kens fixes
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 11 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 2c58cc2..e55123e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.3.0, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.3.1, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.3.0) +AM_INIT_AUTOMAKE(indicator-sound, 0.3.1) AM_MAINTAINER_MODE 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) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8d24b2b..620668e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,8 @@ test_indicator_sound_CFLAGS = \ test_indicator_sound_LDADD = \ libmockpulse.la \ $(PULSEAUDIO_LIBS) \ - $(APPLET_LIBS) + $(APPLET_LIBS) \ + ../src/libsoundmenu.la ######################################### |