echo-cancel: Make Orc file names less silly

The naming was what it was because of the way orc.mak was originally
written. This has changed now.

diff --git a/src/Makefile.am b/src/Makefile.am
index 82bd653c89b9130db27b4b38c257ed02c09b547e..0687e40933283a526dd07aca1dae635ef79d4dc1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1711,10 +1711,10 @@ module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS)
 module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS)
 if HAVE_ORC
-ORC_SOURCE += modules/echo-cancel/adrian-aec-orc
+ORC_SOURCE += modules/echo-cancel/adrian-aec
 nodist_module_echo_cancel_la_SOURCES = \
-                               modules/echo-cancel/adrian-aec-orc-orc-gen.c \
-                               modules/echo-cancel/adrian-aec-orc-orc-gen.h
+                               modules/echo-cancel/adrian-aec-orc-gen.c \
+                               modules/echo-cancel/adrian-aec-orc-gen.h
 module_echo_cancel_la_LIBADD += $(ORC_LIBS)
 module_echo_cancel_la_CFLAGS += $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
 endif

diff --git a/src/modules/echo-cancel/adrian-aec.c b/src/modules/echo-cancel/adrian-aec.c
index 5a4559143268088a15a4592d8533535361bf90c1..6793e59d410f0194fc1827c44f8865ff9d5b59b9 100644 (file)
--- a/src/modules/echo-cancel/adrian-aec.c
+++ b/src/modules/echo-cancel/adrian-aec.c
@@ -18,7 +18,7 @@
 #include "adrian-aec.h"
 
 #ifndef DISABLE_ORC
-#include "adrian-aec-orc-orc-gen.h"
+#include "adrian-aec-orc-gen.h"
 #endif
 
 #ifdef __SSE__

diff --git a/src/modules/echo-cancel/adrian-aec-orc.orc b/src/modules/echo-cancel/adrian-aec.orc
similarity index 100%
rename from src/modules/echo-cancel/adrian-aec-orc.orc
rename to src/modules/echo-cancel/adrian-aec.orc