Merged revisions 1359 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1359 | kpfleming | 2006-08-26 21:02:42 -0500 (Sat, 26 Aug 2006) | 2 lines

merge in new, cleaner Octasic API integration

........


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1361 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 14 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index bbf57a0..f9b774f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif
 KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2)
 KINCLUDES:=$(KSRC)/include
 
-CFLAGS+=-I. -Iinclude -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
 ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
@@ -135,7 +135,7 @@ LTZ_SO_MINOR_VER:=0
 ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),)
   BUILD_XPP:=yes
 endif
-MODULES:=pciradio tor2 torisa wcfxo wct1xxp wct4xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
+MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
 MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
 
 MODULESO:=$(MODULES:%=%.o)
@@ -154,9 +154,10 @@ MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
 
 MOD_DESTDIR:=zaptel
 
-EXTRA_CFLAGS:=-I$(SUBDIRS)/include  -I$(SUBDIRS)/include/oct6100api
 obj-m:=$(MODULESO)
-wct4xxp-objs:=wct4xxp_base.o vpm450m.o
+ifeq ($(findstring wct4xxp,$(MENUSELECT_MODULES)),)
+obj-m+=wct4xxp/
+endif
 
 # Set this to override hotplug firmware loading and revert to classic header
 #HOTPLUG_FIRMWARE=no
@@ -191,18 +192,14 @@ programs: $(BINS)
 
 modules: $(BUILDVER)
 
-linux24: prereq vpm450m_fw.h $(MODULESO)
+linux24: prereq vpm450m_fw.h $(MODULESO) wct4xxp/wct4xxp.o
 
 linux26: prereq vpm450m_fw.h
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-	$(KMAKE) modules
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
 
 xpp: linux26
 
-#ifneq ($(TOPDIR),)
-#include $(TOPDIR)/Rules.make
-#endif
-
 version.h:
 	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
 	@if cmp -s $@.tmp $@ ; then :; else \
@@ -210,6 +207,9 @@ version.h:
 	fi
 	@rm -f $@.tmp
 
+wct4xxp/wct4xxp.o:
+	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
 devel: tor2ee 
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
@@ -230,15 +230,9 @@ pciradio.o: radfw.h
 
 ztdummy.o: ztdummy.h
 
-$(filter-out wct4xxp.o,$(MODULESO)) wct4xxp_base.o: %.o: %.c zaptel.h
+$(MODULESO): %.o: %.c zaptel.h
 	$(CC) $(KFLAGS) -o $@ -c $<
 
-vpm450m.o: vpm450m.c zaptel.h
-	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
-
-wct4xxp.o: wct4xxp_base.o vpm450m.o
-	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
-
 tor2ee.o: tor2-hw.h
 
 tor2ee: LDLIBS+=-lpci
@@ -266,11 +260,6 @@ makefw: CFLAGS=
 gendigits: LDLIBS+=-lm
 gendigits: CFLAGS=
 
-fw2h: CFLAGS=
-
-vpm450m_fw.h: OCT6114-128D.ima fw2h
-	./fw2h $< $@
-
 zaptel.c: tones.h 
 
 prereq: config.status tones.h tor2fw.h radfw.h version.h
@@ -501,7 +490,9 @@ clean:
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
 ifeq ($(BUILDVER),linux26)
-	$(KMAKE) clean
+	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
+else
+	$(MAKE) -C wct4xxp clean
 	$(MAKE) -C datamods clean
 endif
 	rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd
@@ -515,7 +506,6 @@ endif
 	rm -f ztcfg-shared fxstest
 	rm -rf misdn*
 	rm -rf mISDNuser*
-	rm -f fw2h vpm450m_fw.h
 
 distclean: dist-clean