[zaptel-commits] tzafrir: branch 1.2 r2838 - /branches/1.2/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Wed Aug 15 08:36:10 2007
New Revision: 2838

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2838
Log:
* Allow setting the echo canceller from the Makefile or the environment
  (needed for overriding the default EC in Debian m-a builds)
* Allow specifiying extra modules in the make command line:
  MODULES_EXTRA.

Modified:
    branches/1.2/Makefile
    branches/1.2/Makefile.kernel26
    branches/1.2/zconfig.h

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2838&r1=2837&r2=2838
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Aug 15 08:36:10 2007
@@ -61,6 +61,13 @@
 ifeq ($(BUILDVER),linux26)
 MODULES+=ztdummy zttranscode
 endif
+
+# for building extra modules in this directory without editing the
+# Makefiles:
+# running:  make MODULES_EXTRA=mod1 mod2 subdir1/ subdir2/"
+# "subdir/" only works with kernel 2.6.
+MODULES+=$(MODULES_EXTRA)
+
 MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 MODULESO:=$(MODULES:%=%.o)

Modified: branches/1.2/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile.kernel26?view=diff&rev=2838&r1=2837&r2=2838
==============================================================================
--- branches/1.2/Makefile.kernel26 (original)
+++ branches/1.2/Makefile.kernel26 Wed Aug 15 08:36:10 2007
@@ -13,7 +13,13 @@
 endif
 endif
 
+ifndef ECHO_CAN_NAME
+  ECHO_CAN_NAME	:= MG2
+endif
+ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
+
 EXTRA_CFLAGS := -I$(src)
+EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
 
 # fix typo present in CentOS and RHEL 2.6.9 kernels
 BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2

Modified: branches/1.2/zconfig.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/zconfig.h?view=diff&rev=2838&r1=2837&r2=2838
==============================================================================
--- branches/1.2/zconfig.h (original)
+++ branches/1.2/zconfig.h Wed Aug 15 08:36:10 2007
@@ -44,6 +44,9 @@
  */
 /* #define CONFIG_ZAPTEL_MMX */
 
+/** If defined: the user must define exactly one ECHO_CAN_ var: */
+#ifndef ECHO_CAN_FROMENV 
+
 /*
  * Pick your echo canceller.
  * 
@@ -71,7 +74,7 @@
  * MARK2 echo canceller
  */
 /* #define AGGRESSIVE_SUPPRESSOR */
-
+#endif /* ifndef ECHO_CAN_FROMENV */
 /*
  * Define to turn off the echo canceler disable tone detector,
  * which will cause zaptel to ignore the 2100 Hz echo cancel disable