[xiph-commits] r15398 - in trunk/theora: . lib

[giles at svn.xiph.org]

Author: giles
Date: 2008-10-13 19:54:38 -0700 (Mon, 13 Oct 2008)
New Revision: 15398

Modified:
   trunk/theora/SConstruct
   trunk/theora/lib/Makefile.am
Log:
Remove lib/enc from the include paths. This was required to reference 
codec_internal.h from the inline assembly source, but since r15397 we've 
used relative paths to include it.


Modified: trunk/theora/SConstruct
===================================================================
--- trunk/theora/SConstruct	2008-10-14 02:06:24 UTC (rev 15397)
+++ trunk/theora/SConstruct	2008-10-14 02:54:38 UTC (rev 15398)
@@ -161,7 +161,7 @@
   """)
 env = conf.Finish()
 
-env.Append(CPPPATH=['lib', 'include', 'lib/enc'])
+env.Append(CPPPATH=['lib', 'include'])
 env.ParseConfig('pkg-config --cflags --libs ogg')
 
 libtheoradec_a = env.Library('lib/theoradec',

Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am	2008-10-14 02:06:24 UTC (rev 15397)
+++ trunk/theora/lib/Makefile.am	2008-10-14 02:54:38 UTC (rev 15398)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/dec -I$(top_srcdir)/lib/enc
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/dec
 AM_CFLAGS = $(OGG_CFLAGS)
 
 EXTRA_DIST = \