No explicit list of modules to install for 2.6 -it's Kbuild's job.

This closes issue #9948 .


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

1 files changed, 3 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index db7c3ad..89a12cf 100644
--- a/Makefile
+++ b/Makefile
@@ -128,12 +128,6 @@ ifeq ($(BUILDVER),linux24)
   ALL_MODULES:=$(TOPDIR_MODULES:%=$(KERN_DIR)/%.o)
   ALL_MODULES+=$(SUBDIR_MODULES:%=$(KERN_DIR)/%/%.o)
 else
-  INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=$(KERN_DIR)/%.ko)
-  INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(KERN_DIR)/$(mod)/$(mod).ko)
-  ifneq ($(filter xpp,$(BUILD_SUBDIR_MODULES)),)
-  INSTALL_MODULES+=$(patsubst %,$(KERN_DIR)/xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
-  endif
-
   ALL_MODULES:=$(TOPDIR_MODULES:%=%.ko)
   ALL_MODULES+=$(foreach mod,$(filter-out xpp,$(SUBDIR_MODULES)),$(mod)/$(mod).ko)
   ALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
@@ -284,11 +278,7 @@ utils: $(BINS) utils-subdirs
 
 modules: prereq
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-#ifeq ($(BUILDVER),linux26)
 	$(KMAKE) modules
-#else
-#modules: $(INSTALL_MODULES)
-#endif
 
 version.h:
 	@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
@@ -508,15 +498,14 @@ endif
 
 BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
 
-install-modules: $(INSTALL_MODULES) uninstall-modules
+
 ifeq ($(BUILDVER),linux24)
+install-modules: $(INSTALL_MODULES) uninstall-modules
 	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)
 	$(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
 else
+install-modules: 
 	$(KMAKE_INST)
-  ifneq (,$(wildcard datamods/syncppp.ko))
-	$(MAKE) -C datamods install
-  endif
 endif
 	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :