diff options
| author | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2010-01-17 07:35:45 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2010-01-17 07:35:45 +0300 |
| commit | 6c79a9325c328f86fa048bf124ff6a8912a60a3e (patch) | |
| tree | 244a527f799ae1ccfae20100ad972753346fe103 | |
| parent | 619a9681bc03248a4d61efe1c7cb6530f71ab192 (diff) | |
Getting "make dist" to work again with the files that got removedv0.7.1
| -rw-r--r-- | libcelt/Makefile.am | 2 | ||||
| -rw-r--r-- | libcelt/celt.c | 2 | ||||
| -rw-r--r-- | libcelt/modes.h | 1 | ||||
| -rw-r--r-- | libcelt/pitch.h | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
5 files changed, 3 insertions, 12 deletions
diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am index bfda0ef..f34b451 100644 --- a/libcelt/Makefile.am +++ b/libcelt/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = _kiss_fft_guts.h arch.h bands.h fixed_c5x.h fixed_c6x.h \ cwrs.h ecintrin.h entcode.h entdec.h entenc.h fixed_generic.h float_cast.h \ kfft_double.h kiss_fft.h laplace.h mdct.h mfrngcod.h \ mathops.h modes.h os_support.h pitch.h \ - quant_bands.h rate.h stack_alloc.h vq.h + quant_bands.h rate.h stack_alloc.h vq.h plc.c noinst_PROGRAMS = testcelt dump_modes testcelt_SOURCES = testcelt.c diff --git a/libcelt/celt.c b/libcelt/celt.c index 3f2409b..e230e10 100644 --- a/libcelt/celt.c +++ b/libcelt/celt.c @@ -42,12 +42,10 @@ #include <math.h> #include "celt.h" #include "pitch.h" -#include "kiss_fftr.h" #include "bands.h" #include "modes.h" #include "entcode.h" #include "quant_bands.h" -#include "psy.h" #include "rate.h" #include "stack_alloc.h" #include "mathops.h" diff --git a/libcelt/modes.h b/libcelt/modes.h index 891387a..1ab72f8 100644 --- a/libcelt/modes.h +++ b/libcelt/modes.h @@ -38,7 +38,6 @@ #include "celt.h" #include "arch.h" #include "mdct.h" -#include "psy.h" #include "pitch.h" #define CELT_BITSTREAM_VERSION 0x8000000b diff --git a/libcelt/pitch.h b/libcelt/pitch.h index f6d3683..8f3bc0d 100644 --- a/libcelt/pitch.h +++ b/libcelt/pitch.h @@ -39,13 +39,8 @@ #ifndef _PITCH_H #define _PITCH_H -#include "kiss_fftr.h" -#include "psy.h" #include "modes.h" -kiss_fftr_cfg pitch_state_alloc(int max_lag); -void pitch_state_free(kiss_fftr_cfg st); - void pitch_downsample(const celt_sig * restrict x, celt_word16 * restrict x_lp, int len, int end, int _C, celt_sig * restrict xmem, celt_word16 * restrict filt_mem); void pitch_search(const CELTMode *m, const celt_word16 * restrict x_lp, celt_word16 * restrict y, int len, int max_pitch, int *pitch, celt_sig *xmem); diff --git a/tests/Makefile.am b/tests/Makefile.am index 05ebd30..5a7b508 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,13 @@ INCLUDES = -I$(top_srcdir)/libcelt METASOURCES = AUTO -TESTS = type-test ectest cwrs32-test real-fft-test dft-test laplace-test mdct-test mathops-test tandem-test +TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test -noinst_PROGRAMS = type-test ectest cwrs32-test real-fft-test dft-test laplace-test mdct-test mathops-test tandem-test +noinst_PROGRAMS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test type_test_SOURCES = type-test.c ectest_SOURCES = ectest.c cwrs32_test_SOURCES = cwrs32-test.c -real_fft_test_SOURCES = real-fft-test.c dft_test_SOURCES = dft-test.c laplace_test_SOURCES = laplace-test.c mdct_test_SOURCES = mdct-test.c |