From 707fa1cd400650271db50ed40cd15737b274badf Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 17 Jan 2012 14:46:23 +0000 Subject: Build OSLEC EC if in the tree Build the OSLEC echo canceller (drivers/staging/echo and dahdi_echocan_oslec) if the code of oslec is present in the tree. Also closing another issue regarding documentation of building OSLEC, as it is now even clearer than before. Patch has been used in the Debian package for quite some time. Signed-off-by: Tzafrir Cohen (closes issue DAHLIN-110) Reported by: biohumanoid (Pavel Selivanov) Patches: oslec_auto.diff uploaded by tzafrir (license 5035) (closes issue DAHLIN-261) Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10440 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10441 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/Kbuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'drivers/dahdi') diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index 7487f7d..8bbfea0 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -33,14 +33,13 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o obj-m += $(DAHDI_MODULES_EXTRA) -# Only enable this if you think you know what you're doing. This is not -# supported yet: -#obj-m += dahdi_echocan_oslec.o -# -# A quick and dirty way to build OSLEC, if you happened to place it -# yourself in the dahdi source tree. This is experimental. See README -# regarding OSLEC. -#obj-m += ../staging/echo/ +# If you want to build OSLEC, include the code in the standard location: +# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as +# well: +ifneq (,$(wildcard $(src)/../staging/echo/echo.c)) +obj-m += dahdi_echocan_oslec.o +obj-m += ../staging/echo/ +endif CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src) -- cgit v1.2.3