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

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Wed Feb 13 15:18:22 2008
New Revision: 3830

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3830
Log:
No explicit list of modules to install for 2.6 -it's Kbuild's job.

This closes issue #9948 .

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3830&r1=3829&r2=3830
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Feb 13 15:18:22 2008
@@ -128,12 +128,6 @@
   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 @@
 
 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 @@
 
 BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
 
+
+ifeq ($(BUILDVER),linux24)
 install-modules: $(INSTALL_MODULES) uninstall-modules
-ifeq ($(BUILDVER),linux24)
 	$(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) || :