patched to ensure make dist and make distcheck work, thanks Andrea

git-svn-id: https://svn.code.sf.net/p/freetel/code@289 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2/Makefile.am b/codec2/Makefile.am
index f4b1bfb68efcbbc9eb73b18eeaf9b2e04469b5ca..86052636b56e31e39ffb621dceac30425ca104c0 100644 (file)
--- a/codec2/Makefile.am
+++ b/codec2/Makefile.am
@@ -65,30 +65,40 @@ wav/hts1a_speex_8k.wav \
 wav/hts2a_g729a.wav \
 wav/m2400.wav \
 wav/morig_speex_8k.wav \
-src/globals.c \
-unittest/lsp2.txt \
-unittest/lsp7.txt \
-unittest/lspd78.txt \
-unittest/lsp3.txt \
-unittest/lsp8.txt \
-unittest/lspd910.txt \
-unittest/lsp4.txt \
-unittest/lsp9.txt \
-unittest/lsp10.txt \
-unittest/lsp5.txt \
-unittest/lspd123.txt \
-unittest/lsp1.txt \
-unittest/lsp6.txt \
-unittest/lspd456.txt \
-src/codebook/lsp1.txt \
-src/codebook/lsp2.txt \
-src/codebook/lsp3.txt \
-src/codebook/lsp4.txt \
-src/codebook/lsp5.txt \
-src/codebook/lsp6.txt \
-src/codebook/lsp7.txt \
-src/codebook/lsp8.txt \
-src/codebook/lsp9.txt \
-src/codebook/lsp10.txt
+$(top_srcdir)/unittest/lsp2.txt \
+$(top_srcdir)/unittest/lsp7.txt \
+$(top_srcdir)/unittest/lspd78.txt \
+$(top_srcdir)/unittest/lsp3.txt \
+$(top_srcdir)/unittest/lsp8.txt \
+$(top_srcdir)/unittest/lspd910.txt \
+$(top_srcdir)/unittest/lsp4.txt \
+$(top_srcdir)/unittest/lsp9.txt \
+$(top_srcdir)/unittest/lsp10.txt \
+$(top_srcdir)/unittest/lsp5.txt \
+$(top_srcdir)/unittest/lsp1.txt \
+$(top_srcdir)/unittest/lsp6.txt \
+$(top_srcdir)/unittest/lspd456.txt \
+$(top_srcdir)/unittest/lspd678910.txt \
+$(top_srcdir)/src/codebook/lsp1.txt \
+$(top_srcdir)/src/codebook/lsp2.txt \
+$(top_srcdir)/src/codebook/lsp3.txt \
+$(top_srcdir)/src/codebook/lsp4.txt \
+$(top_srcdir)/src/codebook/lsp5.txt \
+$(top_srcdir)/src/codebook/lsp6.txt \
+$(top_srcdir)/src/codebook/lsp7.txt \
+$(top_srcdir)/src/codebook/lsp8.txt \
+$(top_srcdir)/src/codebook/lsp9.txt \
+$(top_srcdir)/src/codebook/lsp10.txt \
+$(top_srcdir)/src/codebook/dlsp1.txt \
+$(top_srcdir)/src/codebook/dlsp2.txt \
+$(top_srcdir)/src/codebook/dlsp3.txt \
+$(top_srcdir)/src/codebook/dlsp4.txt \
+$(top_srcdir)/src/codebook/dlsp5.txt \
+$(top_srcdir)/src/codebook/dlsp6.txt \
+$(top_srcdir)/src/codebook/dlsp7.txt \
+$(top_srcdir)/src/codebook/dlsp8.txt \
+$(top_srcdir)/src/codebook/dlsp9.txt \
+$(top_srcdir)/src/codebook/dlsp10.txt
+
 
 SUBDIRS = src unittest

diff --git a/codec2/Makefile.in b/codec2/Makefile.in
index ae9bb67618c51ab40594b4f80e06f331bcf0aebf..c22270e5ad4c3e231a8768c24cefa35f1a829c16 100644 (file)
--- a/codec2/Makefile.in
+++ b/codec2/Makefile.in
@@ -240,31 +240,40 @@ wav/hts1a_speex_8k.wav \
 wav/hts2a_g729a.wav \
 wav/m2400.wav \
 wav/morig_speex_8k.wav \
-src/globals.c \
-unittest/lsp2.txt \
-unittest/lsp7.txt \
-unittest/lspd78.txt \
-unittest/lsp3.txt \
-unittest/lsp8.txt \
-unittest/lspd910.txt \
-unittest/lsp4.txt \
-unittest/lsp9.txt \
-unittest/lsp10.txt \
-unittest/lsp5.txt \
-unittest/lspd123.txt \
-unittest/lsp1.txt \
-unittest/lsp6.txt \
-unittest/lspd456.txt \
-src/codebook/lsp1.txt \
-src/codebook/lsp2.txt \
-src/codebook/lsp3.txt \
-src/codebook/lsp4.txt \
-src/codebook/lsp5.txt \
-src/codebook/lsp6.txt \
-src/codebook/lsp7.txt \
-src/codebook/lsp8.txt \
-src/codebook/lsp9.txt \
-src/codebook/lsp10.txt
+$(top_srcdir)/unittest/lsp2.txt \
+$(top_srcdir)/unittest/lsp7.txt \
+$(top_srcdir)/unittest/lspd78.txt \
+$(top_srcdir)/unittest/lsp3.txt \
+$(top_srcdir)/unittest/lsp8.txt \
+$(top_srcdir)/unittest/lspd910.txt \
+$(top_srcdir)/unittest/lsp4.txt \
+$(top_srcdir)/unittest/lsp9.txt \
+$(top_srcdir)/unittest/lsp10.txt \
+$(top_srcdir)/unittest/lsp5.txt \
+$(top_srcdir)/unittest/lsp1.txt \
+$(top_srcdir)/unittest/lsp6.txt \
+$(top_srcdir)/unittest/lspd456.txt \
+$(top_srcdir)/unittest/lspd678910.txt \
+$(top_srcdir)/src/codebook/lsp1.txt \
+$(top_srcdir)/src/codebook/lsp2.txt \
+$(top_srcdir)/src/codebook/lsp3.txt \
+$(top_srcdir)/src/codebook/lsp4.txt \
+$(top_srcdir)/src/codebook/lsp5.txt \
+$(top_srcdir)/src/codebook/lsp6.txt \
+$(top_srcdir)/src/codebook/lsp7.txt \
+$(top_srcdir)/src/codebook/lsp8.txt \
+$(top_srcdir)/src/codebook/lsp9.txt \
+$(top_srcdir)/src/codebook/lsp10.txt \
+$(top_srcdir)/src/codebook/dlsp1.txt \
+$(top_srcdir)/src/codebook/dlsp2.txt \
+$(top_srcdir)/src/codebook/dlsp3.txt \
+$(top_srcdir)/src/codebook/dlsp4.txt \
+$(top_srcdir)/src/codebook/dlsp5.txt \
+$(top_srcdir)/src/codebook/dlsp6.txt \
+$(top_srcdir)/src/codebook/dlsp7.txt \
+$(top_srcdir)/src/codebook/dlsp8.txt \
+$(top_srcdir)/src/codebook/dlsp9.txt \
+$(top_srcdir)/src/codebook/dlsp10.txt
 
 SUBDIRS = src unittest
 all: all-recursive
@@ -449,7 +458,7 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
-       $(mkdir_p) $(distdir)/octave $(distdir)/raw $(distdir)/script $(distdir)/src $(distdir)/src/codebook $(distdir)/unittest $(distdir)/wav
+       $(mkdir_p) $(distdir)/$(top_srcdir)/src/codebook $(distdir)/$(top_srcdir)/unittest $(distdir)/octave $(distdir)/raw $(distdir)/script $(distdir)/wav
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/codec2/src/Makefile.am b/codec2/src/Makefile.am
index 90144179e8bba7fc468c16d7046d4efe37a18383..51ffc7ffa0824a9e2930b7948c70cbf33dc05711 100644 (file)
--- a/codec2/src/Makefile.am
+++ b/codec2/src/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTS = gnu
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 
-D=codebook
+D=$(top_srcdir)/src/codebook
 
 # lsp quantisers
 
@@ -41,7 +41,7 @@ CODEBOOKSDVQ= \
   $D/dlsp3.txt \
   $D/dlsp4.txt \
   $D/dlsp5.txt \
-  ../unittest/lspd678910.txt
+  $(top_srcdir)/unittest/lspd678910.txt
 
 noinst_PROGRAMS = generate_codebook
 
@@ -99,7 +99,9 @@ dump.h \
 lpc.h \
 nlp.h  \
 postfilter.h \
-sine.h
+sine.h \
+codec2_internal.h \
+glottal.c
 
 bin_PROGRAMS = c2demo c2enc c2dec c2sim
 

diff --git a/codec2/src/Makefile.in b/codec2/src/Makefile.in
index a4f4dff5047c051cca15b2c1a7a413ae7a01f315..1c961f23d92e0794a40cc652aa24cc60af2045d9 100644 (file)
--- a/codec2/src/Makefile.in
+++ b/codec2/src/Makefile.in
@@ -217,7 +217,7 @@ AM_CFLAGS = -I../src -fPIC -Wall -O3
 AUTOMAKE_OPTS = gnu
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
-D = codebook
+D = $(top_srcdir)/src/codebook
 
 # lsp quantisers
 CODEBOOKS = \
@@ -254,7 +254,7 @@ CODEBOOKSDVQ = \
   $D/dlsp3.txt \
   $D/dlsp4.txt \
   $D/dlsp5.txt \
-  ../unittest/lspd678910.txt
+  $(top_srcdir)/unittest/lspd678910.txt
 
 lib_LTLIBRARIES = libcodec2.la
 libcodec2_la_SOURCES = dump.c \
@@ -291,7 +291,9 @@ dump.h \
 lpc.h \
 nlp.h  \
 postfilter.h \
-sine.h
+sine.h \
+codec2_internal.h \
+glottal.c
 
 c2demo_SOURCES = c2demo.c
 c2demo_LDADD = $(lib_LTLIBRARIES) 

diff --git a/codec2/unittest/Makefile.am b/codec2/unittest/Makefile.am
index 310436d20713da5c9c274d02c7b9d860b1add822..44112464d0547e6ed461c1a47cfc60bc1d1e5bfc 100644 (file)
--- a/codec2/unittest/Makefile.am
+++ b/codec2/unittest/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I../src -fPIC -g  -DFLOATING_POINT -DVAR_ARRAYS -O2
+AM_CFLAGS = -I$(top_srcdir)/src -fPIC -g  -DFLOATING_POINT -DVAR_ARRAYS -O2
 AUTOMAKE_OPTS = gnu
 NAME = libcodec2
 AM_CPPFLAGS = $(AM_CFLAGS)

diff --git a/codec2/unittest/Makefile.in b/codec2/unittest/Makefile.in
index 810b2ccd7ea4a154ad9faa909caf8802f477dd3f..f6ba20a5bc7dd8875d17f50dce9d0ecaf6990a40 100644 (file)
--- a/codec2/unittest/Makefile.in
+++ b/codec2/unittest/Makefile.in
@@ -232,7 +232,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CFLAGS = -I../src -fPIC -g  -DFLOATING_POINT -DVAR_ARRAYS -O2
+AM_CFLAGS = -I$(top_srcdir)/src -fPIC -g  -DFLOATING_POINT -DVAR_ARRAYS -O2
 AUTOMAKE_OPTS = gnu
 NAME = libcodec2
 AM_CPPFLAGS = $(AM_CFLAGS)