[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 10ee7c0fd475f2336949a7615eae22e6032d70c3
Author: Martin Storsjo <martin at martin.st>
Date:   Fri Aug 28 15:54:27 2009 +0200

    Autotoolized the test subdirectory

diff --git a/Makefile.am b/Makefile.am
index 63ff015..21afddf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-SUBDIRS = amrnb amrwb debian
+SUBDIRS = amrnb amrwb debian test
 
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_HEADERS = oscl/oscl_base.h oscl/oscl_mem.h
 
-EXTRA_DIST = LICENSE Makefile.alt build_osx.sh test \
+EXTRA_DIST = LICENSE Makefile.alt build_osx.sh \
              opencore/README opencore/NOTICE opencore/ChangeLog \
              opencore/codecs_v2/audio/gsm_amr/patent_disclaimer.txt \
              opencore/codecs_v2/audio/gsm_amr/common/dec/include \
diff --git a/configure.ac b/configure.ac
index f0e05bf..fa6bc02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ AC_CONFIG_FILES([Makefile
                  amrnb/Makefile
                  amrwb/Makefile
                  debian/Makefile
+                 test/Makefile
                  amrnb/opencore-amrnb.pc
                  amrwb/opencore-amrwb.pc])
 AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..63e9b3f
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,23 @@
+
+noinst_PROGRAMS = amrnb-dec$(EXEEXT) amrnb-enc$(EXEEXT) amrwb-dec$(EXEEXT) linkboth$(EXEEXT)
+
+EXTRA_DIST = Makefile.alt
+
+INCLUDES = -I$(top_srcdir)/amrnb -I$(top_srcdir)/amrwb
+
+CLEANFILES = out.amr out.wav
+
+amrnb_dec_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
+amrnb_enc_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
+amrnb_enc_LDFLAGS = -lm
+amrwb_dec_LDADD = $(top_builddir)/amrwb/libopencore-amrwb.la
+linkboth_LDFLAGS = -static
+linkboth_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la $(top_builddir)/amrwb/libopencore-amrwb.la
+
+amrnb_dec_SOURCES = amrnb-dec.cpp wav.cpp
+amrnb_enc_SOURCES = amrnb-enc.c
+amrwb_dec_SOURCES = amrwb-dec.cpp wav.cpp
+linkboth_SOURCES = linkboth.c
+
+noinst_HEADERS = wav.h
+

-- 
opencore-amr packaging