ref: cd539dfdcdc735baba0722fc9843eb41853eec6b
parent: 8779266cf1414c7d709ebcaaa2f39a59ba7570aa
author: Ralph Giles <[email protected]>
date: Thu Apr 5 05:23:47 EDT 2012
Rename to header makefile fragements to .mk The opus_headers.txt, etc. files are makefile fragments defining variables with a list of required header files for the build. As such they should use the .mk filename extension, just like opus_sources.mk, etc.
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,9 +16,9 @@
SILK_SOURCES += $(SILK_SOURCES_FLOAT)
endif
-include celt_headers.txt
-include silk_headers.txt
-include opus_headers.txt
+include celt_headers.mk
+include silk_headers.mk
+include opus_headers.mk
libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES)
--- /dev/null
+++ b/celt_headers.mk
@@ -1,0 +1,31 @@
+CELT_HEAD = \
+celt/arch.h \
+celt/bands.h \
+celt/celt.h \
+include/opus_types.h \
+include/opus_defines.h \
+include/opus_custom.h \
+celt/cwrs.h \
+celt/ecintrin.h \
+celt/entcode.h \
+celt/entdec.h \
+celt/entenc.h \
+celt/fixed_debug.h \
+celt/fixed_generic.h \
+celt/float_cast.h \
+celt/_kiss_fft_guts.h \
+celt/kiss_fft.h \
+celt/laplace.h \
+celt/mathops.h \
+celt/mdct.h \
+celt/mfrngcod.h \
+celt/modes.h \
+celt/os_support.h \
+celt/pitch.h \
+celt/celt_lpc.h \
+celt/quant_bands.h \
+celt/rate.h \
+celt/stack_alloc.h \
+celt/vq.h \
+celt/static_modes_float.h \
+celt/static_modes_fixed.h
--- a/celt_headers.txt
+++ /dev/null
@@ -1,31 +1,0 @@
-CELT_HEAD = \
-celt/arch.h \
-celt/bands.h \
-celt/celt.h \
-include/opus_types.h \
-include/opus_defines.h \
-include/opus_custom.h \
-celt/cwrs.h \
-celt/ecintrin.h \
-celt/entcode.h \
-celt/entdec.h \
-celt/entenc.h \
-celt/fixed_debug.h \
-celt/fixed_generic.h \
-celt/float_cast.h \
-celt/_kiss_fft_guts.h \
-celt/kiss_fft.h \
-celt/laplace.h \
-celt/mathops.h \
-celt/mdct.h \
-celt/mfrngcod.h \
-celt/modes.h \
-celt/os_support.h \
-celt/pitch.h \
-celt/celt_lpc.h \
-celt/quant_bands.h \
-celt/rate.h \
-celt/stack_alloc.h \
-celt/vq.h \
-celt/static_modes_float.h \
-celt/static_modes_fixed.h
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -18,8 +18,8 @@
mkdir "${destdir}/celt" mkdir "${destdir}/include" for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \- "${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.txt \- "${toplevel}"/celt_headers.txt "${toplevel}"/silk_headers.txt \+ "${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.mk \+ "${toplevel}"/celt_headers.mk "${toplevel}"/silk_headers.mk \| grep '\.[ch]' | sed -e 's/^.*=//' -e 's/\\\\//'` ; do
cp -a "${toplevel}/${f}" "${destdir}/${f}"done
--- /dev/null
+++ b/opus_headers.mk
@@ -1,0 +1,4 @@
+OPUS_HEAD = \
+include/opus.h \
+include/opus_multistream.h \
+src/opus_private.h
--- a/opus_headers.txt
+++ /dev/null
@@ -1,4 +1,0 @@
-OPUS_HEAD = \
-include/opus.h \
-include/opus_multistream.h \
-src/opus_private.h
--- /dev/null
+++ b/silk_headers.mk
@@ -1,0 +1,26 @@
+SILK_HEAD = \
+silk/debug.h \
+silk/control.h \
+silk/errors.h \
+silk/API.h \
+silk/typedef.h \
+silk/define.h \
+silk/main.h \
+silk/PLC.h \
+silk/structs.h \
+silk/tables.h \
+silk/tuning_parameters.h \
+silk/Inlines.h \
+silk/MacroCount.h \
+silk/MacroDebug.h \
+silk/macros.h \
+silk/pitch_est_defines.h \
+silk/resampler_private.h \
+silk/resampler_rom.h \
+silk/resampler_structs.h \
+silk/SigProc_FIX.h \
+silk/fixed/main_FIX.h \
+silk/fixed/structs_FIX.h \
+silk/float/main_FLP.h \
+silk/float/structs_FLP.h \
+silk/float/SigProc_FLP.h
--- a/silk_headers.txt
+++ /dev/null
@@ -1,26 +1,0 @@
-SILK_HEAD = \
-silk/debug.h \
-silk/control.h \
-silk/errors.h \
-silk/API.h \
-silk/typedef.h \
-silk/define.h \
-silk/main.h \
-silk/PLC.h \
-silk/structs.h \
-silk/tables.h \
-silk/tuning_parameters.h \
-silk/Inlines.h \
-silk/MacroCount.h \
-silk/MacroDebug.h \
-silk/macros.h \
-silk/pitch_est_defines.h \
-silk/resampler_private.h \
-silk/resampler_rom.h \
-silk/resampler_structs.h \
-silk/SigProc_FIX.h \
-silk/fixed/main_FIX.h \
-silk/fixed/structs_FIX.h \
-silk/float/main_FLP.h \
-silk/float/structs_FLP.h \
-silk/float/SigProc_FLP.h