[xiph-commits] r18984 - in trunk/ao/src: . plugins/alsa

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2013-08-21 12:04:07 -0700 (Wed, 21 Aug 2013)
New Revision: 18984

Modified:
   trunk/ao/src/Makefile.am
   trunk/ao/src/plugins/alsa/Makefile.am
Log:
Insure that the alsa plugin links against libao, since the plugin calls ao_is_big_endian from libao.
Closes Trac #1779


Modified: trunk/ao/src/Makefile.am
===================================================================
--- trunk/ao/src/Makefile.am	2013-08-20 22:53:24 UTC (rev 18983)
+++ trunk/ao/src/Makefile.am	2013-08-21 19:04:07 UTC (rev 18984)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = plugins
+SUBDIRS = . plugins
 
 INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -I$(top_srcdir)/include/ao -DAO_PLUGIN_PATH=\"@plugindir@\"
 

Modified: trunk/ao/src/plugins/alsa/Makefile.am
===================================================================
--- trunk/ao/src/plugins/alsa/Makefile.am	2013-08-20 22:53:24 UTC (rev 18983)
+++ trunk/ao/src/plugins/alsa/Makefile.am	2013-08-21 19:04:07 UTC (rev 18984)
@@ -20,7 +20,7 @@
 lib_LTLIBRARIES = $(alsaltlibs)
 
 libalsa_la_LDFLAGS = @PLUGIN_LDFLAGS@
-libalsa_la_LIBADD = @ALSA_LIBS@
+libalsa_la_LIBADD = @ALSA_LIBS@ ../../libao.la
 libalsa_la_SOURCES = $(alsasources)
 
 EXTRA_DIST = ao_alsa.c