From e6a09d383c7ef1b658814f3a92ccbca0f0cc103f Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 12 Apr 2009 10:52:40 +0000
Subject: [PATCH] Move FOUND_AUDIO_PLAYER above the rest of the audio players
 to preserve link ordering.  Also add libaudio_player.a to the final link.

Originally committed to SVN as r2794.
---
 aegisub/src/Makefile.am | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am
index cfeae8303..b0a25acfa 100644
--- a/aegisub/src/Makefile.am
+++ b/aegisub/src/Makefile.am
@@ -30,6 +30,13 @@ if BUILD_DARWIN
 aegisub_2_1_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
 endif
 
+if FOUND_AUDIO_PLAYER
+noinst_LIBRARIES += libaudio_player.a
+libaudio_player_a_SOURCES = audio_player.cpp
+libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @PORTAUDIO2_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
+aegisub_2_1_LDADD += libaudio_player.a
+endif
+
 if HAVE_ALSA
 noinst_LIBRARIES += libaudio_alsa.a
 libaudio_alsa_a_SOURCES = audio_player_alsa.cpp
@@ -69,12 +76,6 @@ aegisub_2_1_LDFLAGS += @OPENAL_LIBS@
 aegisub_2_1_LDADD += libaudio_openal.a
 endif
 
-if FOUND_AUDIO_PLAYER
-noinst_LIBRARIES += libaudio_player.a
-libaudio_player_a_SOURCES = audio_player.cpp
-libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @PORTAUDIO2_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
-endif
-
 if HAVE_FFMPEG
 aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
 endif