[zaptel-commits] tzafrir: branch tzafrir/kernelmove r2320 - /team/tzafrir/kernelmove/

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Fri Mar 16 22:27:17 2007
New Revision: 2320

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2320
Log:
* Menuselect was temporarily disabled before due to build problems. Re-eabled.
* fxotune.h should use wctdm.h from kernel/ .
* fxotune.c should not re-include wctdm.h .
* Remove enaother reference to an xpp- target that has snuck in on a merge.

Modified:
    team/tzafrir/kernelmove/Makefile
    team/tzafrir/kernelmove/fxotune.c
    team/tzafrir/kernelmove/fxotune.h

Modified: team/tzafrir/kernelmove/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/Makefile?view=diff&rev=2320&r1=2319&r2=2320
==============================================================================
--- team/tzafrir/kernelmove/Makefile (original)
+++ team/tzafrir/kernelmove/Makefile Fri Mar 16 22:27:17 2007
@@ -162,8 +162,6 @@
 all: menuselect.makeopts modules programs
 
 programs: $(BINS) $(LTZ_SO) $(LTZ_A)
-
-programs: $(BINS) xpp-utils
 
 modules: $(BUILDVER)
 
@@ -423,8 +421,7 @@
 	@echo "****"
 	@exit 1
 
-#menuselect.makeopts: menuselect/menuselect menuselect-tree
-menuselect.makeopts: 
+menuselect.makeopts: menuselect/menuselect menuselect-tree
 	#@menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 	touch $@
 

Modified: team/tzafrir/kernelmove/fxotune.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/fxotune.c?view=diff&rev=2320&r1=2319&r2=2320
==============================================================================
--- team/tzafrir/kernelmove/fxotune.c (original)
+++ team/tzafrir/kernelmove/fxotune.c Fri Mar 16 22:27:17 2007
@@ -28,7 +28,6 @@
 #else
 #include <zaptel/zaptel.h>
 #endif
-#include "wctdm.h"
 #include "fxotune.h"
 
 #define TEST_DURATION 2000			/* 4000 samples (or 500 ms) of test */

Modified: team/tzafrir/kernelmove/fxotune.h
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/fxotune.h?view=diff&rev=2320&r1=2319&r2=2320
==============================================================================
--- team/tzafrir/kernelmove/fxotune.h (original)
+++ team/tzafrir/kernelmove/fxotune.h Fri Mar 16 22:27:17 2007
@@ -13,7 +13,7 @@
  * (C) 2005 Digium, Inc.
  */
 
-#include "wctdm.h"
+#include "kernel/wctdm.h"
 
 struct wctdm_echo_coefs echo_trys [] =
 {