From 7c5fc17422189b8d057db1388fe8de0c4094f16d Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 5 Sep 2011 04:28:20 +0000 Subject: [PATCH] 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 --- codec2/Makefile.am | 60 +++++++++++++++++++++--------------- codec2/Makefile.in | 61 +++++++++++++++++++++---------------- codec2/src/Makefile.am | 8 +++-- codec2/src/Makefile.in | 8 +++-- codec2/unittest/Makefile.am | 2 +- codec2/unittest/Makefile.in | 2 +- 6 files changed, 82 insertions(+), 59 deletions(-) diff --git a/codec2/Makefile.am b/codec2/Makefile.am index f4b1bfb6..86052636 100644 --- 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 ae9bb676..c22270e5 100644 --- 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 90144179..51ffc7ff 100644 --- 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 a4f4dff5..1c961f23 100644 --- 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 310436d2..44112464 100644 --- 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 810b2ccd..f6ba20a5 100644 --- 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) -- 2.25.1