[xiph-commits] r9203 - in trunk/speex: libspeex src

[jm at motherfish-iii.xiph.org]

Author: jm
Date: 2005-05-02 00:05:30 -0700 (Mon, 02 May 2005)
New Revision: 9203

Modified:
   trunk/speex/libspeex/Makefile.am
   trunk/speex/src/Makefile.am
   trunk/speex/src/speexdec.c
   trunk/speex/src/speexenc.c
   trunk/speex/src/wav_io.h
Log:
support for top_builddir != top_srcdir


Modified: trunk/speex/libspeex/Makefile.am
===================================================================
--- trunk/speex/libspeex/Makefile.am	2005-05-02 05:17:37 UTC (rev 9202)
+++ trunk/speex/libspeex/Makefile.am	2005-05-02 07:05:30 UTC (rev 9203)
@@ -4,7 +4,7 @@
 
 EXTRA_DIST=testenc.c testenc_wb.c testenc_uwb.c testdenoise.c testecho.c
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
 
 lib_LTLIBRARIES = libspeex.la
 

Modified: trunk/speex/src/Makefile.am
===================================================================
--- trunk/speex/src/Makefile.am	2005-05-02 05:17:37 UTC (rev 9202)
+++ trunk/speex/src/Makefile.am	2005-05-02 07:05:30 UTC (rev 9203)
@@ -5,7 +5,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libspeex @OGG_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@
 
 mandir = $(prefix)/share/man
 man_MANS = speexenc.1 speexdec.1

Modified: trunk/speex/src/speexdec.c
===================================================================
--- trunk/speex/src/speexdec.c	2005-05-02 05:17:37 UTC (rev 9202)
+++ trunk/speex/src/speexdec.c	2005-05-02 07:05:30 UTC (rev 9203)
@@ -84,7 +84,6 @@
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
-#include "misc.h"
 
 #define MAX_FRAME_SIZE 2000
 

Modified: trunk/speex/src/speexenc.c
===================================================================
--- trunk/speex/src/speexenc.c	2005-05-02 05:17:37 UTC (rev 9202)
+++ trunk/speex/src/speexenc.c	2005-05-02 07:05:30 UTC (rev 9203)
@@ -50,7 +50,6 @@
 #include "wav_io.h"
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
-#include "misc.h"
 #include <speex/speex_preprocess.h>
 
 #if defined WIN32 || defined _WIN32

Modified: trunk/speex/src/wav_io.h
===================================================================
--- trunk/speex/src/wav_io.h	2005-05-02 05:17:37 UTC (rev 9202)
+++ trunk/speex/src/wav_io.h	2005-05-02 07:05:30 UTC (rev 9203)
@@ -30,6 +30,7 @@
 */
 
 #ifndef WAV_IO_H
+#define WAV_IO_H
 
 #include <stdio.h>