[xiph-commits] r16952 - trunk/ao/src

[conrad at svn.xiph.org]

Author: conrad
Date: 2010-03-06 18:17:10 -0800 (Sat, 06 Mar 2010)
New Revision: 16952

Modified:
   trunk/ao/src/Makefile.am
Log:
fix for out-of-tree builds: $srcdir and $builddir are both needed.

However, now we have both "-I$(top_srcdir)/include" and
"-I$(top_srcdir/include/ao". To simplify this, the source files should
be modified to all use only one form, eg. "ao/foo.h" or "foo.h".

Modified: trunk/ao/src/Makefile.am
===================================================================
--- trunk/ao/src/Makefile.am	2010-03-06 14:44:34 UTC (rev 16951)
+++ trunk/ao/src/Makefile.am	2010-03-07 02:17:10 UTC (rev 16952)
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = plugins
 
-INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -DAO_PLUGIN_PATH=\"@plugindir@\"
+INCLUDES = -I$(top_builddir)/include/ao -I$(top_srcdir)/include -I$(top_srcdir)/include/ao -DAO_PLUGIN_PATH=\"@plugindir@\"
 
 lib_LTLIBRARIES = libao.la