[zaptel-commits] kpfleming: branch 1.4 r4384 - in /branches/1.4: ./ kernel/wctdm24xxp/ kernel/...

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Tue Jul  1 15:37:06 2008
New Revision: 4384

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4384
Log:
use symlinks to make multiple builds of voicebus.o, so it doesn't get rebuilt twice every time 'make' is run to build modules

Added:
    branches/1.4/kernel/wctdm24xxp/voicebus.c   (with props)
    branches/1.4/kernel/wcte12xp/voicebus.c   (with props)
Modified:
    branches/1.4/kernel/wctdm24xxp/Kbuild
    branches/1.4/kernel/wcte12xp/Kbuild
    branches/1.4/ztmonitor.c

Modified: branches/1.4/kernel/wctdm24xxp/Kbuild
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/Kbuild?view=diff&rev=4384&r1=4383&r2=4384
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/Kbuild (original)
+++ branches/1.4/kernel/wctdm24xxp/Kbuild Tue Jul  1 15:37:06 2008
@@ -8,7 +8,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-wctdm24xxp-objs := base.o GpakCust.o GpakApi.o ../voicebus.o
+wctdm24xxp-objs := base.o GpakCust.o GpakApi.o voicebus.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wctdm24xxp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o

Added: branches/1.4/kernel/wctdm24xxp/voicebus.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/voicebus.c?view=auto&rev=4384
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/voicebus.c (added)
+++ branches/1.4/kernel/wctdm24xxp/voicebus.c Tue Jul  1 15:37:06 2008
@@ -1,0 +1,1 @@
+link ../voicebus.c

Propchange: branches/1.4/kernel/wctdm24xxp/voicebus.c
------------------------------------------------------------------------------
    svn:special = *

Modified: branches/1.4/kernel/wcte12xp/Kbuild
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/Kbuild?view=diff&rev=4384&r1=4383&r2=4384
==============================================================================
--- branches/1.4/kernel/wcte12xp/Kbuild (original)
+++ branches/1.4/kernel/wcte12xp/Kbuild Tue Jul  1 15:37:06 2008
@@ -8,7 +8,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-wcte12xp-objs := base.o vpmadt032.o GpakApi.o ../voicebus.o
+wcte12xp-objs := base.o vpmadt032.o GpakApi.o voicebus.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wcte12xp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o

Added: branches/1.4/kernel/wcte12xp/voicebus.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/voicebus.c?view=auto&rev=4384
==============================================================================
--- branches/1.4/kernel/wcte12xp/voicebus.c (added)
+++ branches/1.4/kernel/wcte12xp/voicebus.c Tue Jul  1 15:37:06 2008
@@ -1,0 +1,1 @@
+link ../voicebus.c

Propchange: branches/1.4/kernel/wcte12xp/voicebus.c
------------------------------------------------------------------------------
    svn:special = *

Modified: branches/1.4/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztmonitor.c?view=diff&rev=4384&r1=4383&r2=4384
==============================================================================
--- branches/1.4/ztmonitor.c (original)
+++ branches/1.4/ztmonitor.c Tue Jul  1 15:37:06 2008
@@ -299,10 +299,10 @@
 		fprintf(stderr, "        -r FILE: Save rx stream to FILE. Implies -m.\n");
 		fprintf(stderr, "        -t FILE: Save tx stream to FILE. Implies -m.\n");
 		fprintf(stderr, "        -s FILE: Save stereo rx/tx stream to FILE. Implies -m.\n");
-		fprintf(stderr, "        -F FILE: Save combined pre-echocanceled rx/tx stream to FILE. Cannot be used with -m. Implies -p.\n");
-		fprintf(stderr, "        -R FILE: Save pre-echocanceled rx stream to FILE. Implies -m and -p.\n");
-		fprintf(stderr, "        -T FILE: Save pre-echocanceled tx stream to FILE. Implies -m and -p.\n");
-		fprintf(stderr, "        -S FILE: Save pre-echocanceled stereo rx/tx stream to FILE. Implies -m and -p.\n");
+		fprintf(stderr, "        -F FILE: Save combined pre-echocanceled rx/tx stream to FILE. Cannot be used with -m.\n");
+		fprintf(stderr, "        -R FILE: Save pre-echocanceled rx stream to FILE. Implies -m.\n");
+		fprintf(stderr, "        -T FILE: Save pre-echocanceled tx stream to FILE. Implies -m.\n");
+		fprintf(stderr, "        -S FILE: Save pre-echocanceled stereo rx/tx stream to FILE. Implies -m.\n");
 		fprintf(stderr, "Examples:\n");
 		fprintf(stderr, "Save a stream to a file\n");
 		fprintf(stderr, "        ztmonitor 1 -f stream.raw\n");