summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2012-01-17 14:50:01 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2012-01-17 14:50:01 +0000
commit41f96488d6bcacda640cac0c71e7e882324fbe9d (patch)
tree91a2451c9c8cdf3be713bb7eb2c0a8eb5506cbac /drivers
parentb9908040c01908ed27ca21c25e2b46137a294b6e (diff)
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 <tzafrir.cohen@xorcom.com> (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.6@10442 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dahdi/Kbuild15
1 files changed, 7 insertions, 8 deletions
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)