fix autotools build, bump version numberv0.9.5draft-07

5 files changed, 63 insertions, 54 deletions

diff --git a/Makefile.am b/Makefile.am
index 42166551..7df07c82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,16 @@ include celt_sources.mk
 include silk_sources.mk
 include opus_sources.mk
 
+include celt_headers.txt
+include silk_headers.txt
+include opus_headers.txt
+
 libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES)
 
 pkginclude_HEADERS = src/opus.h
 
+noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD)
+
 noinst_PROGRAMS = test_opus
 
 test_opus_SOURCES = src/test_opus.c
diff --git a/celt_headers.txt b/celt_headers.txt
index 44e18165..ad74a4d4 100644
--- a/celt_headers.txt
+++ b/celt_headers.txt
@@ -1,28 +1,29 @@
-libcelt/arch.h
-libcelt/bands.h
-libcelt/celt.h
-libcelt/celt_types.h
-libcelt/cwrs.h
-libcelt/ecintrin.h
-libcelt/entcode.h
-libcelt/entdec.h
-libcelt/entenc.h
-libcelt/fixed_debug.h
-libcelt/fixed_generic.h
-libcelt/float_cast.h
-libcelt/_kiss_fft_guts.h
-libcelt/kiss_fft.h
-libcelt/laplace.h
-libcelt/mathops.h
-libcelt/mdct.h
-libcelt/mfrngcod.h
-libcelt/modes.h
-libcelt/os_support.h
-libcelt/pitch.h
-libcelt/plc.h
-libcelt/quant_bands.h
-libcelt/rate.h
-libcelt/stack_alloc.h
-libcelt/vq.h
-libcelt/static_modes_float.c
+CELT_HEAD = \
+libcelt/arch.h \
+libcelt/bands.h \
+libcelt/celt.h \
+libcelt/celt_types.h \
+libcelt/cwrs.h \
+libcelt/ecintrin.h \
+libcelt/entcode.h \
+libcelt/entdec.h \
+libcelt/entenc.h \
+libcelt/fixed_debug.h \
+libcelt/fixed_generic.h \
+libcelt/float_cast.h \
+libcelt/_kiss_fft_guts.h \
+libcelt/kiss_fft.h \
+libcelt/laplace.h \
+libcelt/mathops.h \
+libcelt/mdct.h \
+libcelt/mfrngcod.h \
+libcelt/modes.h \
+libcelt/os_support.h \
+libcelt/pitch.h \
+libcelt/plc.h \
+libcelt/quant_bands.h \
+libcelt/rate.h \
+libcelt/stack_alloc.h \
+libcelt/vq.h \
+libcelt/static_modes_float.c \
 libcelt/static_modes_fixed.c
diff --git a/configure.ac b/configure.ac
index 4783fc35..e73cd87b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AM_CONFIG_HEADER([config.h])
 
 OPUS_MAJOR_VERSION=0
 OPUS_MINOR_VERSION=9
-OPUS_MICRO_VERSION=4
+OPUS_MICRO_VERSION=5
 OPUS_EXTRA_VERSION=
 OPUS_VERSION=$OPUS_MAJOR_VERSION.$OPUS_MINOR_VERSION.$OPUS_MICRO_VERSION$OPUS_EXTRA_VERSION
 LIBOPUS_SUFFIX=0
diff --git a/opus_headers.txt b/opus_headers.txt
index 97a8de22..3c315a05 100644
--- a/opus_headers.txt
+++ b/opus_headers.txt
@@ -1,3 +1,4 @@
-src/opus_decoder.h
-src/opus_encoder.h
+OPUS_HEAD = \
+src/opus_decoder.h \
+src/opus_encoder.h \
 src/opus.h
diff --git a/silk_headers.txt b/silk_headers.txt
index 6f160b7f..d0d5ade5 100644
--- a/silk_headers.txt
+++ b/silk_headers.txt
@@ -1,25 +1,26 @@
-silk/silk_debug.h
-silk/silk_control.h
-silk/silk_errors.h
-silk/silk_API.h
-silk/silk_typedef.h
-silk/silk_define.h
-silk/silk_main.h
-silk/silk_PLC.h
-silk/silk_structs.h
-silk/silk_tables.h
-silk/silk_tuning_parameters.h
-silk/silk_Inlines.h
-silk/silk_MacroCount.h
-silk/silk_MacroDebug.h
-silk/silk_macros.h
-silk/silk_pitch_est_defines.h
-silk/silk_resampler_private.h
-silk/silk_resampler_rom.h
-silk/silk_resampler_structs.h
-silk/silk_SigProc_FIX.h
-silk/fixed/silk_main_FIX.h
-silk/fixed/silk_structs_FIX.h
-silk/float/silk_main_FLP.h
-silk/float/silk_structs_FLP.h
+SILK_HEAD = \
+silk/silk_debug.h \
+silk/silk_control.h \
+silk/silk_errors.h \
+silk/silk_API.h \
+silk/silk_typedef.h \
+silk/silk_define.h \
+silk/silk_main.h \
+silk/silk_PLC.h \
+silk/silk_structs.h \
+silk/silk_tables.h \
+silk/silk_tuning_parameters.h \
+silk/silk_Inlines.h \
+silk/silk_MacroCount.h \
+silk/silk_MacroDebug.h \
+silk/silk_macros.h \
+silk/silk_pitch_est_defines.h \
+silk/silk_resampler_private.h \
+silk/silk_resampler_rom.h \
+silk/silk_resampler_structs.h \
+silk/silk_SigProc_FIX.h \
+silk/fixed/silk_main_FIX.h \
+silk/fixed/silk_structs_FIX.h \
+silk/float/silk_main_FLP.h \
+silk/float/silk_structs_FLP.h \
 silk/float/silk_SigProc_FLP.h