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

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sat Feb 16 08:15:54 2008
New Revision: 3838

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3838
Log:
Cut a few more lines 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=3838&r1=3837&r2=3838
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Feb 16 08:15:54 2008
@@ -55,9 +55,6 @@
     UDEVRULES=yes
   endif
   HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
-else
-  # Hotplug firmware loading is not supported on any other version then 2.6
-  HOTPLUG_FIRMWARE:=no
 endif
 
 # If the file .zaptel.makeopts is present in your home directory, you can
@@ -167,7 +164,7 @@
 KFLAGS+=-DSTANDALONE_ZAPATA
 CFLAGS+=-DSTANDALONE_ZAPATA
 ifeq ($(BUILDVER),linux24)
-KMAKE	= $(MAKE) -C kernel HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) \
+KMAKE	= $(MAKE) -C kernel HOTPLUG_FIRMWARE=no \
   BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
 else
 KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
@@ -496,9 +493,6 @@
 	done;
 endif
 
-BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
-
-
 ifeq ($(BUILDVER),linux24)
 install-modules: $(INSTALL_MODULES) uninstall-modules
 	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)