support for top_builddir != top_srcdir
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Mon, 2 May 2005 07:05:30 +0000 (07:05 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Mon, 2 May 2005 07:05:30 +0000 (07:05 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@9203 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/Makefile.am
src/Makefile.am
src/speexdec.c
src/speexenc.c
src/wav_io.h

index 7b0199b..8b3aa4d 100644 (file)
@@ -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
 
index 6debe05..4c688f7 100644 (file)
@@ -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
index a510d36..1d7be53 100644 (file)
@@ -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
 
index bbca828..c9f3036 100644 (file)
@@ -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
index 2cfe4b5..b51d2eb 100644 (file)
@@ -30,6 +30,7 @@
 */
 
 #ifndef WAV_IO_H
+#define WAV_IO_H
 
 #include <stdio.h>