From ef369c2e2b9334f05ad4fa78c44190bbdb9af3ba Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 13 Nov 2011 14:19:38 -0800 Subject: Makefile.am: Add PULSE_LIBS for linking the mixer when compiling with pulse Commit 3a3158 introduced a small bug where the pulseaudio mixer would not link with the main binary in some situations. --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6b612529f..22856fe82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ src_mpd_LDADD = \ $(OUTPUT_LIBS) \ $(FILTER_LIBS) \ $(ENCODER_LIBS) \ - libmixer_plugins.a \ + $(MIXER_LIBS) \ $(GLIB_LIBS) mpd_headers = \ @@ -741,6 +741,10 @@ OUTPUT_API_SRC = \ liboutput_plugins_a_SOURCES = \ src/output/null_output_plugin.c +MIXER_LIBS = \ + libmixer_plugins.a \ + $(PULSE_LIBS) + MIXER_API_SRC = \ src/mixer_control.c \ src/mixer_type.c \ -- cgit v1.2.3