[zaptel-commits] tzafrir: branch 1.4 r3820 - /branches/1.4/Makefile

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sat Feb  9 05:27:08 2008
New Revision: 3820

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3820
Log:
Remove some unused kernel 2.4 code from the Makefile.

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3820&r1=3819&r2=3820
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Feb  9 05:27:08 2008
@@ -58,22 +58,6 @@
 else
   # Hotplug firmware loading is not supported on any other version then 2.6
   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
@@ -306,19 +290,6 @@
 #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 @@
 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 @@
 
 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 ; \