Remove some unused kernel 2.4 code from the Makefile.

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

1 files changed, 2 insertions, 61 deletions

diff --git a/Makefile b/Makefile
index 5822fc2..ee164c7 100644
--- a/Makefile
+++ b/Makefile
@@ -60,22 +60,6 @@ else
   HOTPLUG_FIRMWARE:=no
 endif
 
-ifeq ($(HOTPLUG_FIRMWARE),yes)
-  CFLAGS+=-DHOTPLUG_FIRMWARE
-endif
-
-ifeq ($(ARCH),i386)
-ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),)
-HPEC_PRESENT=yes
-endif
-endif
-
-ifeq ($(ARCH),x86_64)
-ifneq ($(wildcard $(PWD)/hpec/hpec_x86_64.o_shipped),)
-HPEC_PRESENT=yes
-endif
-endif
-
 # If the file .zaptel.makeopts is present in your home directory, you can
 # include all of your favorite menuselect options so that every time you download
 # a new version of Asterisk, you don't have to run menuselect to set them.
@@ -306,19 +290,6 @@ modules: prereq
 #modules: $(INSTALL_MODULES)
 #endif
 
-ifeq ($(HPEC_PRESENT),yes)
-ifeq ($(ARCH),i386)
-ZAPTEL_HPEC:=hpec/hpec_x86_32.o_shipped
-endif
-
-ifeq ($(ARCH),x86_64)
-ZAPTEL_HPEC:=hpec/hpec_x86_64.o_shipped
-endif
-
-KFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
-zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
-endif
-
 version.h:
 	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
 	@if cmp -s $@.tmp $@ ; then :; else \
@@ -380,37 +351,8 @@ fxstest: LDLIBS+=-lm
 fxotune: LDLIBS+=-lm
 fxsdump: LDLIBS+=-lm
 
-ifeq ($(BUILDVER),linux24)
-wct4xxp/wct4xxp.o:
-	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-
-tor2.o: tor2-hw.h tor2fw.h
-
-zaptel-base.o: digits.h arith.h sec.h sec-2.h kb1ec.h mg2ec.h zconfig.h
-
-wcusb.o: wcusb.h
-
-wctdm.o: wctdm.h
-
-wctdm24xxp/wctdm24xxp.o:
-	$(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-
-wcte12xp/wcte12xp.o:
-	$(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-
-pciradio.o: radfw.h
-
-ztdummy.o: ztdummy.h
-
-zaptel.o: zaptel-base.o $(ZAPTEL_HPEC)
-	$(LD) -r -o $@ $< $(ZAPTEL_HPEC)
-
-$(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
-	$(CC) $(KFLAGS) -o $@ -c $<
-endif
-
 stackcheck: checkstack modules
-	./checkstack *.ko */*.ko
+	./checkstack kernel/*.ko kernel/*/*.ko
 
 README.html: README
 	$(ASCIIDOC) -n -a toc -a toclevels=3 $<
@@ -555,8 +497,7 @@ uninstall-hotplug:
 
 BASENAMES=$(sort $(shell for x in $(ALL_MODULES); do basename $x; done))
 uninstall-modules:
-ifeq ($(BUILDVER),linux24)
-else
+ifneq ($(BUILDVER),linux24)
 	@./build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) $(BASENAMES)
 	@for x in $(ALL_MODULES); do \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/extra/$$x ; \