ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/indicator-sound/distcheck-fixes into lp:indicator-sound.

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


Fixes distcheck, the 0.3.0 tarball was missing files and wouldn't build.
-- 
https://code.launchpad.net/~ken-vandine/indicator-sound/distcheck-fixes/+merge/27874
Your team ayatana-commits is subscribed to branch lp:indicator-sound.

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-06-16 17:19:35 +0000
+++ src/Makefile.am	2010-06-17 19:08:27 +0000
@@ -7,7 +7,7 @@
 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 @@
 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 @@
 	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)

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-03-31 11:40:08 +0000
+++ tests/Makefile.am	2010-06-17 19:08:27 +0000
@@ -32,7 +32,8 @@
 test_indicator_sound_LDADD = \
 	libmockpulse.la \
 	$(PULSEAUDIO_LIBS) \
-	$(APPLET_LIBS) 
+	$(APPLET_LIBS) \
+        ../src/libsoundmenu.la 
 
 
 #########################################