eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-05-23 19:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moves the main headers from src/ to include/

Browse source
This commit is contained in:
Jean-Marc Valin 2011-10-26 21:36:57 -04:00
parent 82c985932f
commit 4923f3f80e
16 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile.am
View file

@ -4,7 +4,7 @@ lib_LTLIBRARIES = libopus.la
SUBDIRS = . celt/tests doc SUBDIRS = . celt/tests doc
INCLUDES = -I$(top_srcdir)/celt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/celt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
include celt_sources.mk include celt_sources.mk
include silk_sources.mk include silk_sources.mk
@ -22,7 +22,7 @@ include opus_headers.txt
libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES) libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES)
pkginclude_HEADERS = src/opus.h src/opus_multistream.h celt/opus_types.h celt/opus_defines.h pkginclude_HEADERS = include/opus.h include/opus_multistream.h include/opus_types.h include/opus_defines.h
noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD) noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD)
@ -41,17 +41,17 @@ repacketizer_demo_LDADD = libopus.la -lm
opus_compare_SOURCES = src/opus_compare.c opus_compare_SOURCES = src/opus_compare.c
opus_compare_LDADD = -lm opus_compare_LDADD = -lm
test_opus_api_SOURCES = tests/test_opus_api.c test_opus_api_SOURCES = tests/test_opus_api.c tests/test_opus_common.h
test_opus_api_LDADD = libopus.la -lm test_opus_api_LDADD = libopus.la -lm
test_opus_encode_SOURCES = tests/test_opus_encode.c test_opus_encode_SOURCES = tests/test_opus_encode.c tests/test_opus_common.h
test_opus_encode_LDADD = libopus.la -lm test_opus_encode_LDADD = libopus.la -lm
test_opus_decode_SOURCES = tests/test_opus_decode.c test_opus_decode_SOURCES = tests/test_opus_decode.c tests/test_opus_common.h
test_opus_decode_LDADD = libopus.la -lm test_opus_decode_LDADD = libopus.la -lm
if CUSTOM_MODES if CUSTOM_MODES
pkginclude_HEADERS += celt/opus_custom.h pkginclude_HEADERS += include/opus_custom.h
noinst_PROGRAMS += opus_custom_demo noinst_PROGRAMS += opus_custom_demo
opus_custom_demo_SOURCES = celt/opus_custom_demo.c opus_custom_demo_SOURCES = celt/opus_custom_demo.c
opus_custom_demo_LDADD = libopus.la -lm opus_custom_demo_LDADD = libopus.la -lm

3
Makefile.draft
View file

@ -53,7 +53,8 @@ ifdef FIXED_POINT
CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API CFLAGS += -DFIXED_POINT=1 -DDISABLE_FLOAT_API
endif endif
CINCLUDES += silk/ \ CINCLUDES += include/ \
silk/ \
silk/float/ \ silk/float/ \
silk/fixed/ \ silk/fixed/ \
celt/ \ celt/ \

2
celt/tests/Makefile.am
View file

@ -1,4 +1,4 @@
INCLUDES = -I$(top_srcdir)/celt INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/celt
METASOURCES = AUTO METASOURCES = AUTO
TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test rotation-test TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test rotation-test

4
celt_headers.txt
View file

@ -2,8 +2,8 @@ CELT_HEAD = \
celt/arch.h \ celt/arch.h \
celt/bands.h \ celt/bands.h \
celt/celt.h \ celt/celt.h \
celt/opus_types.h \ include/opus_types.h \
celt/opus_defines.h \ include/opus_defines.h \
celt/cwrs.h \ celt/cwrs.h \
celt/ecintrin.h \ celt/ecintrin.h \
celt/entcode.h \ celt/entcode.h \

8
doc/Doxyfile.in
View file

@ -610,10 +610,10 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = @top_srcdir@/src/opus.h \ INPUT = @top_srcdir@/include/opus.h \
@top_srcdir@/celt/opus_types.h \ @top_srcdir@/include/opus_types.h \
@top_srcdir@/celt/opus_defines.h \ @top_srcdir@/include/opus_defines.h \
@top_srcdir@/src/opus_multistream.h @top_srcdir@/include/opus_multistream.h
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

8
doc/Makefile.am
View file

@ -1,9 +1,9 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
DOCINPUTS = $(top_srcdir)/src/opus.h \ DOCINPUTS = $(top_srcdir)/include/opus.h \
$(top_srcdir)/src/opus_multistream.h \ $(top_srcdir)/include/opus_multistream.h \
$(top_srcdir)/celt/opus_defines.h \ $(top_srcdir)/include/opus_defines.h \
$(top_srcdir)/celt/opus_types.h $(top_srcdir)/include/opus_types.h
doc_DATA = doxygen-build.stamp doc_DATA = doxygen-build.stamp

3
doc/build_draft.sh
View file

@ -16,6 +16,7 @@ mkdir "${destdir}/silk"
mkdir "${destdir}/silk/float" mkdir "${destdir}/silk/float"
mkdir "${destdir}/silk/fixed" mkdir "${destdir}/silk/fixed"
mkdir "${destdir}/celt" mkdir "${destdir}/celt"
mkdir "${destdir}/include"
for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \ for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
"${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.txt \ "${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.txt \
"${toplevel}"/celt_headers.txt "${toplevel}"/silk_headers.txt \ "${toplevel}"/celt_headers.txt "${toplevel}"/silk_headers.txt \
@ -25,7 +26,7 @@ done
cp -a "${toplevel}"/src/opus_demo.c "${destdir}"/src/ cp -a "${toplevel}"/src/opus_demo.c "${destdir}"/src/
cp -a "${toplevel}"/src/opus_compare.c "${destdir}"/src/ cp -a "${toplevel}"/src/opus_compare.c "${destdir}"/src/
cp -a "${toplevel}"/celt/opus_custom_demo.c "${destdir}"/celt/ cp -a "${toplevel}"/celt/opus_custom_demo.c "${destdir}"/celt/
cp -a "${toplevel}"/celt/opus_custom.h "${destdir}"/celt/ cp -a "${toplevel}"/include/opus_custom.h "${destdir}"/celt/
cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile
cp -a "${toplevel}"/opus_sources.mk "${destdir}"/ cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
cp -a "${toplevel}"/celt_sources.mk "${destdir}"/ cp -a "${toplevel}"/celt_sources.mk "${destdir}"/

0
src/opus.h → include/opus.h
View file

0
celt/opus_custom.h → include/opus_custom.h
View file

0
celt/opus_defines.h → include/opus_defines.h
View file

0
src/opus_multistream.h → include/opus_multistream.h
View file

0
celt/opus_types.h → include/opus_types.h
View file

4
opus_headers.txt
View file

@ -1,4 +1,4 @@
OPUS_HEAD = \ OPUS_HEAD = \
src/opus.h \ include/opus.h \
src/opus_multistream.h \ include/opus_multistream.h \
src/opus_private.h src/opus_private.h

2
tests/test_opus_api.c
View file

@ -49,7 +49,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "../src/opus.h" #include "../include/opus.h"
#include "test_opus_common.h" #include "test_opus_common.h"
#ifdef VALGRIND #ifdef VALGRIND

2
tests/test_opus_decode.c
View file

@ -37,7 +37,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "../src/opus.h" #include "../include/opus.h"
#include "test_opus_common.h" #include "test_opus_common.h"
#define MAX_PACKET (1500) #define MAX_PACKET (1500)

2
tests/test_opus_encode.c
View file

@ -37,7 +37,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "../src/opus.h" #include "../include/opus.h"
#include "../src/opus_private.h" #include "../src/opus_private.h"
#include "test_opus_common.h" #include "test_opus_common.h"