[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2ec28ece76ec6f94103b2c6415a09c5bea08d72f
Author: Martin Storsjo <martin at martin.st>
Date:   Fri Aug 28 15:48:00 2009 +0200

    Use headers and libraries from the local directories instead

diff --git a/test/Makefile.alt b/test/Makefile.alt
index b465d2f..afab10e 100644
--- a/test/Makefile.alt
+++ b/test/Makefile.alt
@@ -1,6 +1,6 @@
-CFLAGS = -Wall -pedantic
+CFLAGS = -Wall -pedantic -I../amrnb -I../amrwb
 CXXFLAGS = $(CFLAGS)
-LDFLAGS =
+LDFLAGS = -L../amrnb -L../amrwb
 
 all: amrnb-dec amrnb-enc amrwb-dec
 
diff --git a/test/amrnb-dec.cpp b/test/amrnb-dec.cpp
index 86922b5..98a352d 100644
--- a/test/amrnb-dec.cpp
+++ b/test/amrnb-dec.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "wav.h"
 extern "C" {
-#include <opencore-amrnb/interf_dec.h>
+#include <interf_dec.h>
 }
 
 /* From WmfDecBytesPerFrame in dec_input_format_tab.cpp */
diff --git a/test/amrnb-enc.c b/test/amrnb-enc.c
index 2889a74..9a16098 100644
--- a/test/amrnb-enc.c
+++ b/test/amrnb-enc.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <math.h>
-#include <opencore-amrnb/interf_enc.h>
+#include <interf_enc.h>
 
 int main(int argc, char *argv[]) {
 	int i, j;
diff --git a/test/amrwb-dec.cpp b/test/amrwb-dec.cpp
index 22bc9e7..740181d 100644
--- a/test/amrwb-dec.cpp
+++ b/test/amrwb-dec.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "wav.h"
 extern "C" {
-#include <opencore-amrwb/dec_if.h>
+#include <dec_if.h>
 }
 
 /* From pvamrwbdecoder_api.h, by dividing by 8 and rounding up */
diff --git a/test/linkboth.c b/test/linkboth.c
index 4a9cf3f..d2345ae 100644
--- a/test/linkboth.c
+++ b/test/linkboth.c
@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
-#include <opencore-amrnb/interf_dec.h>
-#include <opencore-amrnb/interf_enc.h>
-#include <opencore-amrwb/dec_if.h>
+#include <interf_dec.h>
+#include <interf_enc.h>
+#include <dec_if.h>
 
 int main(int argc, char *argv[]) {
 	void* amrnb = Decoder_Interface_init();

-- 
opencore-amr packaging