[zaptel-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r1930 - in /team/mogorman/za...

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 23 11:35:50 2007
New Revision: 1930

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1930
Log:
driver name change

Added:
    team/mogorman/zaptel-1.2-transcoder/wctc4xxp/
      - copied from r1929, team/mogorman/zaptel-1.2-transcoder/wctc4xxb/
Removed:
    team/mogorman/zaptel-1.2-transcoder/wctc4xxb/
Modified:
    team/mogorman/zaptel-1.2-transcoder/Makefile

Modified: team/mogorman/zaptel-1.2-transcoder/Makefile
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/Makefile?view=diff&rev=1930&r1=1929&r2=1930
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/Makefile (original)
+++ team/mogorman/zaptel-1.2-transcoder/Makefile Tue Jan 23 11:35:50 2007
@@ -118,8 +118,8 @@
 MOD_DESTDIR:=zaptel
 
 obj-m:=$(MODULESO)
-obj-m+=wct4xxp/ wctc4xxb/
-MODULES+=wct4xxp wctc4xxb
+obj-m+=wct4xxp/ wctc4xxp/
+MODULES+=wct4xxp wctc4xxp
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
 # for i386. On other archs the module will probably build but panic.
@@ -137,7 +137,7 @@
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
-linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o wctc4xxb/wctc4xxb.o $(BINS)
+linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o wctc4xxp/wctc4xxp.o $(BINS)
 
 linux26: prereq $(BINS)
 	@echo $(KSRC)
@@ -154,8 +154,8 @@
 wct4xxp/wct4xxp.o:
 	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
-wctc4xxb/wctc4xxb.o:
-	$(MAKE) -C wctc4xxb KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+wctc4xxp/wctc4xxp.o:
+	$(MAKE) -C wctc4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
 devel: tor2ee 
 
@@ -332,7 +332,7 @@
 	done; \
 	$(KMAKE_INST);
 else
-	for x in $(MODULESO) wct4xxp/wct4xxp.o wctc4xxb/wctc4xxb.o; do \
+	for x in $(MODULESO) wct4xxp/wct4xxp.o wctc4xxp/wctc4xxp.o; do \
 		install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
 	done;
 
@@ -367,11 +367,11 @@
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 	if [ -d $(INSTALL_PREFIX)/usr/lib/hotplug/firmware ]; then \
 		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
-		install -m 644 wctc4xxb/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
+		install -m 644 wctc4xxp/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
 	fi
 	if [ -d $(INSTALL_PREFIX)/lib/firmware ]; then \
 		install -m 644 wct4xxp/*.ima $(INSTALL_PREFIX)/lib/firmware; \
-		install -m 644 wctc4xxb/*.bin $(INSTALL_PREFIX)/lib/firmware; \
+		install -m 644 wctc4xxp/*.bin $(INSTALL_PREFIX)/lib/firmware; \
 	fi
 	@echo "Installed firmware"
 else
@@ -419,7 +419,7 @@
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
 else
 	$(MAKE) -C wct4xxp clean
-	$(MAKE) -C wctc4xxb clean
+	$(MAKE) -C wctc4xxp clean
 endif
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h