renames the libcelt/ directory to celt/

diff --git a/.gitignore b/.gitignore
index 7f9475f..3431b2f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,5 @@ tests/*test
 tools/celtdec
 tools/celtenc
 celt.pc
-libcelt.spec
-libcelt/dump_modes/dump_modes
+celt.spec
+celt/dump_modes/dump_modes

diff --git a/Makefile.am b/Makefile.am
index 612498e..bfd4061 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 lib_LTLIBRARIES = libopus.la
 
-SUBDIRS = . libcelt/tests doc
+SUBDIRS = . celt/tests doc
 
-INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
+INCLUDES = -I$(top_srcdir)/celt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
 
 include celt_sources.mk
 include silk_sources.mk
@@ -22,7 +22,7 @@ include opus_headers.txt
 
 libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES)
 
-pkginclude_HEADERS = src/opus.h src/opus_multistream.h libcelt/opus_types.h libcelt/opus_defines.h
+pkginclude_HEADERS = src/opus.h src/opus_multistream.h celt/opus_types.h celt/opus_defines.h
 
 noinst_HEADERS = $(OPUS_HEAD) $(SILK_HEAD) $(CELT_HEAD)
 
@@ -37,9 +37,9 @@ test_repacketizer_SOURCES = src/test_repacketizer.c
 test_repacketizer_LDADD = libopus.la -lm
 
 if CUSTOM_MODES
-pkginclude_HEADERS += libcelt/opus_custom.h
+pkginclude_HEADERS += celt/opus_custom.h
 noinst_PROGRAMS += test_opus_custom
-test_opus_custom_SOURCES = libcelt/test_opus_custom.c
+test_opus_custom_SOURCES = celt/test_opus_custom.c
 test_opus_custom_LDADD = libopus.la -lm
 endif
 

diff --git a/Makefile.draft b/Makefile.draft
index dba78fd..37d62fc 100644 (file)
--- a/Makefile.draft
+++ b/Makefile.draft
@@ -74,7 +74,7 @@ ARCHIVE.cmdline     = $(AR) $(ARFLAGS) $@ $^ && $(RANLIB) $@
 CINCLUDES += silk/ \
         silk/float/ \
         silk/fixed/ \
-       libcelt/ \
+       celt/ \
        src/
 
 # VPATH e.g. VPATH = src:../headers

diff --git a/libcelt/_kiss_fft_guts.h b/celt/_kiss_fft_guts.h
similarity index 100%
rename from libcelt/_kiss_fft_guts.h
rename to celt/_kiss_fft_guts.h

diff --git a/libcelt/arch.h b/celt/arch.h
similarity index 100%
rename from libcelt/arch.h
rename to celt/arch.h

diff --git a/libcelt/bands.c b/celt/bands.c
similarity index 100%
rename from libcelt/bands.c
rename to celt/bands.c

diff --git a/libcelt/bands.h b/celt/bands.h
similarity index 100%
rename from libcelt/bands.h
rename to celt/bands.h

diff --git a/libcelt/celt.c b/celt/celt.c
similarity index 100%
rename from libcelt/celt.c
rename to celt/celt.c

diff --git a/libcelt/celt.h b/celt/celt.h
similarity index 100%
rename from libcelt/celt.h
rename to celt/celt.h

diff --git a/libcelt/libcelt.vcxproj b/celt/celt.vcxproj
similarity index 96%
rename from libcelt/libcelt.vcxproj
rename to celt/celt.vcxproj
index 6be1813..a597662 100644 (file)
--- a/libcelt/libcelt.vcxproj
+++ b/celt/celt.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{245603E3-F580-41A5-9632-B25FE3372CBF}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
-    <RootNamespace>libcelt</RootNamespace>\r
+    <RootNamespace>celt</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
@@ -122,4 +122,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/libcelt/libcelt.vcxproj.filters b/celt/celt.vcxproj.filters
similarity index 100%
rename from libcelt/libcelt.vcxproj.filters
rename to celt/celt.vcxproj.filters

diff --git a/libcelt/cwrs.c b/celt/cwrs.c
similarity index 100%
rename from libcelt/cwrs.c
rename to celt/cwrs.c

diff --git a/libcelt/cwrs.h b/celt/cwrs.h
similarity index 100%
rename from libcelt/cwrs.h
rename to celt/cwrs.h

diff --git a/libcelt/dump_modes/Makefile b/celt/dump_modes/Makefile
similarity index 100%
rename from libcelt/dump_modes/Makefile
rename to celt/dump_modes/Makefile

diff --git a/libcelt/dump_modes/dump_modes.c b/celt/dump_modes/dump_modes.c
similarity index 100%
rename from libcelt/dump_modes/dump_modes.c
rename to celt/dump_modes/dump_modes.c

diff --git a/libcelt/ecintrin.h b/celt/ecintrin.h
similarity index 100%
rename from libcelt/ecintrin.h
rename to celt/ecintrin.h

diff --git a/libcelt/entcode.c b/celt/entcode.c
similarity index 100%
rename from libcelt/entcode.c
rename to celt/entcode.c

diff --git a/libcelt/entcode.h b/celt/entcode.h
similarity index 100%
rename from libcelt/entcode.h
rename to celt/entcode.h

diff --git a/libcelt/entdec.c b/celt/entdec.c
similarity index 100%
rename from libcelt/entdec.c
rename to celt/entdec.c

diff --git a/libcelt/entdec.h b/celt/entdec.h
similarity index 100%
rename from libcelt/entdec.h
rename to celt/entdec.h

diff --git a/libcelt/entenc.c b/celt/entenc.c
similarity index 100%
rename from libcelt/entenc.c
rename to celt/entenc.c

diff --git a/libcelt/entenc.h b/celt/entenc.h
similarity index 100%
rename from libcelt/entenc.h
rename to celt/entenc.h

diff --git a/libcelt/fixed_c5x.h b/celt/fixed_c5x.h
similarity index 100%
rename from libcelt/fixed_c5x.h
rename to celt/fixed_c5x.h

diff --git a/libcelt/fixed_c6x.h b/celt/fixed_c6x.h
similarity index 100%
rename from libcelt/fixed_c6x.h
rename to celt/fixed_c6x.h

diff --git a/libcelt/fixed_debug.h b/celt/fixed_debug.h
similarity index 100%
rename from libcelt/fixed_debug.h
rename to celt/fixed_debug.h

diff --git a/libcelt/fixed_generic.h b/celt/fixed_generic.h
similarity index 100%
rename from libcelt/fixed_generic.h
rename to celt/fixed_generic.h

diff --git a/libcelt/float_cast.h b/celt/float_cast.h
similarity index 100%
rename from libcelt/float_cast.h
rename to celt/float_cast.h

diff --git a/libcelt/kiss_fft.c b/celt/kiss_fft.c
similarity index 100%
rename from libcelt/kiss_fft.c
rename to celt/kiss_fft.c

diff --git a/libcelt/kiss_fft.h b/celt/kiss_fft.h
similarity index 100%
rename from libcelt/kiss_fft.h
rename to celt/kiss_fft.h

diff --git a/libcelt/laplace.c b/celt/laplace.c
similarity index 100%
rename from libcelt/laplace.c
rename to celt/laplace.c

diff --git a/libcelt/laplace.h b/celt/laplace.h
similarity index 100%
rename from libcelt/laplace.h
rename to celt/laplace.h

diff --git a/libcelt/mathops.c b/celt/mathops.c
similarity index 100%
rename from libcelt/mathops.c
rename to celt/mathops.c

diff --git a/libcelt/mathops.h b/celt/mathops.h
similarity index 100%
rename from libcelt/mathops.h
rename to celt/mathops.h

diff --git a/libcelt/mdct.c b/celt/mdct.c
similarity index 100%
rename from libcelt/mdct.c
rename to celt/mdct.c

diff --git a/libcelt/mdct.h b/celt/mdct.h
similarity index 100%
rename from libcelt/mdct.h
rename to celt/mdct.h

diff --git a/libcelt/mfrngcod.h b/celt/mfrngcod.h
similarity index 100%
rename from libcelt/mfrngcod.h
rename to celt/mfrngcod.h

diff --git a/libcelt/modes.c b/celt/modes.c
similarity index 100%
rename from libcelt/modes.c
rename to celt/modes.c

diff --git a/libcelt/modes.h b/celt/modes.h
similarity index 100%
rename from libcelt/modes.h
rename to celt/modes.h

diff --git a/libcelt/opus_custom.h b/celt/opus_custom.h
similarity index 100%
rename from libcelt/opus_custom.h
rename to celt/opus_custom.h

diff --git a/libcelt/opus_defines.h b/celt/opus_defines.h
similarity index 100%
rename from libcelt/opus_defines.h
rename to celt/opus_defines.h

diff --git a/libcelt/opus_types.h b/celt/opus_types.h
similarity index 100%
rename from libcelt/opus_types.h
rename to celt/opus_types.h

diff --git a/libcelt/os_support.h b/celt/os_support.h
similarity index 100%
rename from libcelt/os_support.h
rename to celt/os_support.h

diff --git a/libcelt/pitch.c b/celt/pitch.c
similarity index 100%
rename from libcelt/pitch.c
rename to celt/pitch.c

diff --git a/libcelt/pitch.h b/celt/pitch.h
similarity index 100%
rename from libcelt/pitch.h
rename to celt/pitch.h

diff --git a/libcelt/plc.c b/celt/plc.c
similarity index 100%
rename from libcelt/plc.c
rename to celt/plc.c

diff --git a/libcelt/plc.h b/celt/plc.h
similarity index 100%
rename from libcelt/plc.h
rename to celt/plc.h

diff --git a/libcelt/quant_bands.c b/celt/quant_bands.c
similarity index 100%
rename from libcelt/quant_bands.c
rename to celt/quant_bands.c

diff --git a/libcelt/quant_bands.h b/celt/quant_bands.h
similarity index 100%
rename from libcelt/quant_bands.h
rename to celt/quant_bands.h

diff --git a/libcelt/rate.c b/celt/rate.c
similarity index 100%
rename from libcelt/rate.c
rename to celt/rate.c

diff --git a/libcelt/rate.h b/celt/rate.h
similarity index 100%
rename from libcelt/rate.h
rename to celt/rate.h

diff --git a/libcelt/stack_alloc.h b/celt/stack_alloc.h
similarity index 100%
rename from libcelt/stack_alloc.h
rename to celt/stack_alloc.h

diff --git a/libcelt/static_modes_fixed.h b/celt/static_modes_fixed.h
similarity index 100%
rename from libcelt/static_modes_fixed.h
rename to celt/static_modes_fixed.h

diff --git a/libcelt/static_modes_float.h b/celt/static_modes_float.h
similarity index 100%
rename from libcelt/static_modes_float.h
rename to celt/static_modes_float.h

diff --git a/libcelt/test_opus_custom.c b/celt/test_opus_custom.c
similarity index 100%
rename from libcelt/test_opus_custom.c
rename to celt/test_opus_custom.c

diff --git a/libcelt/tests/Makefile.am b/celt/tests/Makefile.am
similarity index 93%
rename from libcelt/tests/Makefile.am
rename to celt/tests/Makefile.am
index 55dcb95..9c4d899 100644 (file)
--- a/libcelt/tests/Makefile.am
+++ b/celt/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libcelt
+INCLUDES = -I$(top_srcdir)/celt
 METASOURCES = AUTO
 
 TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test rotation-test

diff --git a/libcelt/tests/cwrs32-test.c b/celt/tests/cwrs32-test.c
similarity index 95%
rename from libcelt/tests/cwrs32-test.c
rename to celt/tests/cwrs32-test.c
index b8885d6..ee73315 100644 (file)
--- a/libcelt/tests/cwrs32-test.c
+++ b/celt/tests/cwrs32-test.c
@@ -6,13 +6,13 @@
 #include <string.h>
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/cwrs.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/rate.h"
+#include "../celt/stack_alloc.h"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
+#include "../celt/cwrs.c"
+#include "../celt/mathops.c"
+#include "../celt/rate.h"
 
 #define NMAX (240)
 #define KMAX (128)

diff --git a/libcelt/tests/dft-test.c b/celt/tests/dft-test.c
similarity index 95%
rename from libcelt/tests/dft-test.c
rename to celt/tests/dft-test.c
index 2e2491a..1bf4e74 100644 (file)
--- a/libcelt/tests/dft-test.c
+++ b/celt/tests/dft-test.c
@@ -12,10 +12,10 @@
 #include "kiss_fft.h"
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
+#include "../celt/stack_alloc.h"
+#include "../celt/kiss_fft.c"
+#include "../celt/mathops.c"
+#include "../celt/entcode.c"
 
 
 #ifndef M_PI

diff --git a/libcelt/tests/ectest.c b/celt/tests/ectest.c
similarity index 98%
rename from libcelt/tests/ectest.c
rename to celt/tests/ectest.c
index 3abdfcd..ee4fc5a 100644 (file)
--- a/libcelt/tests/ectest.c
+++ b/celt/tests/ectest.c
@@ -11,9 +11,9 @@
 #include "entdec.h"
 #include <string.h>
 
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
 
 #ifndef M_LOG2E
 # define M_LOG2E    1.4426950408889634074

diff --git a/libcelt/tests/laplace-test.c b/celt/tests/laplace-test.c
similarity index 88%
rename from libcelt/tests/laplace-test.c
rename to celt/tests/laplace-test.c
index 222bc69..3c4cbd7 100644 (file)
--- a/libcelt/tests/laplace-test.c
+++ b/celt/tests/laplace-test.c
@@ -6,12 +6,12 @@
 #include <stdlib.h>
 #include "laplace.h"
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
+#include "../celt/stack_alloc.h"
 
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/laplace.c"
+#include "../celt/entenc.c"
+#include "../celt/entdec.c"
+#include "../celt/entcode.c"
+#include "../celt/laplace.c"
 
 #define DATA_SIZE 40000
 

diff --git a/libcelt/tests/mathops-test.c b/celt/tests/mathops-test.c
similarity index 100%
rename from libcelt/tests/mathops-test.c
rename to celt/tests/mathops-test.c

diff --git a/libcelt/tests/mdct-test.c b/celt/tests/mdct-test.c
similarity index 95%
rename from libcelt/tests/mdct-test.c
rename to celt/tests/mdct-test.c
index 4f0733a..67da13a 100644 (file)
--- a/libcelt/tests/mdct-test.c
+++ b/celt/tests/mdct-test.c
@@ -11,12 +11,12 @@
 #include <stdio.h>
 #include "mdct.h"
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
+#include "../celt/stack_alloc.h"
 
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mdct.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
+#include "../celt/kiss_fft.c"
+#include "../celt/mdct.c"
+#include "../celt/mathops.c"
+#include "../celt/entcode.c"
 
 #ifndef M_PI
 #define M_PI 3.141592653

diff --git a/libcelt/tests/real-fft-test.c b/celt/tests/real-fft-test.c
similarity index 97%
rename from libcelt/tests/real-fft-test.c
rename to celt/tests/real-fft-test.c
index 3996b4a..3f3f7b2 100644 (file)
--- a/libcelt/tests/real-fft-test.c
+++ b/celt/tests/real-fft-test.c
@@ -8,9 +8,9 @@
 #include <string.h>
 
 #define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/kiss_fftr.c"
+#include "../celt/stack_alloc.h"
+#include "../celt/kiss_fft.c"
+#include "../celt/kiss_fftr.c"
 
 #ifdef FIXED_DEBUG
 long long celt_mips=0;

diff --git a/libcelt/tests/rotation-test.c b/celt/tests/rotation-test.c
similarity index 100%
rename from libcelt/tests/rotation-test.c
rename to celt/tests/rotation-test.c

diff --git a/libcelt/tests/type-test.c b/celt/tests/type-test.c
similarity index 100%
rename from libcelt/tests/type-test.c
rename to celt/tests/type-test.c

diff --git a/libcelt/vq.c b/celt/vq.c
similarity index 100%
rename from libcelt/vq.c
rename to celt/vq.c

diff --git a/libcelt/vq.h b/celt/vq.h
similarity index 100%
rename from libcelt/vq.h
rename to celt/vq.h

diff --git a/celt_headers.txt b/celt_headers.txt
index 73e119d..26b7cfa 100644 (file)
--- a/celt_headers.txt
+++ b/celt_headers.txt
@@ -1,30 +1,30 @@
 CELT_HEAD = \
-libcelt/arch.h \
-libcelt/bands.h \
-libcelt/celt.h \
-libcelt/opus_types.h \
-libcelt/opus_defines.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.h \
-libcelt/static_modes_fixed.h
+celt/arch.h \
+celt/bands.h \
+celt/celt.h \
+celt/opus_types.h \
+celt/opus_defines.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/plc.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

diff --git a/celt_sources.mk b/celt_sources.mk
index b5721ae..13c1921 100644 (file)
--- a/celt_sources.mk
+++ b/celt_sources.mk
@@ -1,16 +1,16 @@
-CELT_SOURCES = libcelt/bands.c \
-libcelt/celt.c \
-libcelt/cwrs.c \
-libcelt/entcode.c \
-libcelt/entdec.c \
-libcelt/entenc.c \
-libcelt/kiss_fft.c \
-libcelt/laplace.c \
-libcelt/mathops.c \
-libcelt/mdct.c \
-libcelt/modes.c \
-libcelt/pitch.c \
-libcelt/plc.c \
-libcelt/quant_bands.c \
-libcelt/rate.c \
-libcelt/vq.c
+CELT_SOURCES = celt/bands.c \
+celt/celt.c \
+celt/cwrs.c \
+celt/entcode.c \
+celt/entdec.c \
+celt/entenc.c \
+celt/kiss_fft.c \
+celt/laplace.c \
+celt/mathops.c \
+celt/mdct.c \
+celt/modes.c \
+celt/pitch.c \
+celt/plc.c \
+celt/quant_bands.c \
+celt/rate.c \
+celt/vq.c

diff --git a/configure.ac b/configure.ac
index ab46eae..d68c372 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ fi
 AM_CONDITIONAL([FIXED_POINT], [test x$ac_enable_fixed = xyes])
 AM_CONDITIONAL([CUSTOM_MODES], [test x$ac_enable_custom_modes = xyes])
 
-AC_OUTPUT([Makefile libcelt/tests/Makefile
+AC_OUTPUT([Makefile celt/tests/Makefile
            opus.pc opus-uninstalled.pc
            doc/Makefile doc/Doxyfile])
 

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 9ab8d58..108c7ba 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -611,8 +611,8 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = @top_srcdir@/src/opus.h \
-                        @top_srcdir@/libcelt/opus_types.h   \
-                         @top_srcdir@/libcelt/opus_defines.h \
+                        @top_srcdir@/celt/opus_types.h   \
+                         @top_srcdir@/celt/opus_defines.h \
                          @top_srcdir@/src/opus_multistream.h
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3b135dd..bd7eba3 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,8 @@
 
 DOCINPUTS = $(top_srcdir)/src/opus.h \
             $(top_srcdir)/src/opus_multistream.h \
-            $(top_srcdir)/libcelt/opus_defines.h \
-            $(top_srcdir)/libcelt/opus_types.h
+            $(top_srcdir)/celt/opus_defines.h \
+            $(top_srcdir)/celt/opus_types.h
 
 doc_DATA = doxygen-build.stamp
 

diff --git a/doc/build_draft.sh b/doc/build_draft.sh
index cbf14a4..105dbd0 100755 (executable)
--- a/doc/build_draft.sh
+++ b/doc/build_draft.sh
@@ -15,7 +15,7 @@ mkdir "${destdir}/src"
 mkdir "${destdir}/silk"
 mkdir "${destdir}/silk/float"
 mkdir "${destdir}/silk/fixed"
-mkdir "${destdir}/libcelt"
+mkdir "${destdir}/celt"
 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 \
@@ -23,8 +23,8 @@ for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
   cp -a "${toplevel}/${f}" "${destdir}/${f}"
 done
 cp -a "${toplevel}"/src/test_opus.c "${destdir}"/src/
-cp -a "${toplevel}"/libcelt/test_opus_custom.c "${destdir}"/libcelt/
-cp -a "${toplevel}"/libcelt/opus_custom.h "${destdir}"/libcelt/
+cp -a "${toplevel}"/celt/test_opus_custom.c "${destdir}"/celt/
+cp -a "${toplevel}"/celt/opus_custom.h "${destdir}"/celt/
 cp -a "${toplevel}"/Makefile.draft "${destdir}"/Makefile
 cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
 cp -a "${toplevel}"/celt_sources.mk "${destdir}"/

diff --git a/opus-uninstalled.pc.in b/opus-uninstalled.pc.in
index b6a8678..3f5d29f 100644 (file)
--- a/opus-uninstalled.pc.in
+++ b/opus-uninstalled.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Requires:
 Conflicts:
 Libs: ${libdir}/libopus.a
-Cflags: -I${includedir}/src -I${includedir}/libcelt
+Cflags: -I${includedir}/src -I${includedir}/celt

diff --git a/opus.sln b/opus.sln
index c248b95..6d2ea4e 100644 (file)
--- a/opus.sln
+++ b/opus.sln
@@ -27,7 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silk_float", "silk\float\si
                {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16} = {C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libcelt\libcelt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "celt", "celt\celt.vcxproj", "{245603E3-F580-41A5-9632-B25FE3372CBF}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index 12b88f6..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-EXTRA_DIST = hybrid.vcxproj.filters  hybrid.vcxproj
-
-INCLUDES = -I$(top_srcdir)/celt/libcelt/ -I$(top_srcdir)/silk/interface 
-
-lib_LTLIBRARIES = libietfcodec.la
-libietfcodec_la_SOURCES = opus_decoder.c opus_encoder.c
-
-noinst_HEADERS = opus_decoder.h opus_encoder.h
-
-pkginclude_HEADERS = opus.h
-
-noinst_PROGRAMS = test_opus
-
-test_opus_SOURCES = test_opus.c
-test_opus_LDADD = libietfcodec.la $(top_builddir)/celt/libcelt/libcelt0.la $(top_builddir)/silk/libSKP_SILK_SDK.la
-