[dahdi-commits] tzafrir: linux/trunk r4829 - in /linux/trunk: Makefile drivers/dahdi/Kbuild

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Mon Aug 25 13:03:04 2008
New Revision: 4829

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4829
Log:
Support MODULES_EXTRA and SUBDIRS_EXTRA to add extra modules from the
make command line.

Modified:
    linux/trunk/Makefile
    linux/trunk/drivers/dahdi/Kbuild

Modified: linux/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/linux/trunk/Makefile?view=diff&rev=4829&r1=4828&r2=4829
==============================================================================
--- linux/trunk/Makefile (original)
+++ linux/trunk/Makefile Mon Aug 25 13:03:04 2008
@@ -16,6 +16,8 @@
 else
 UNAME_M:=$(DEB_HOST_GNU_TYPE)
 endif
+
+DAHDI_MODULES_EXTRA:=$(MODULES_EXTRA:%=%.o) $(SUBDIRS_EXTRA:%=%/)
 
 # If you want to build for a kernel other than the current kernel, set KVERS
 ifndef KVERS
@@ -57,7 +59,7 @@
 
 DAHDI_BUILD_ALL:=m
 
-KMAKE=$(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+KMAKE=$(MAKE) -C $(KSRC) ARCH=$(ARCH) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 
 ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d))
   DYNFS:=yes

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=4829&r1=4828&r2=4829
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Mon Aug 25 13:03:04 2008
@@ -25,6 +25,8 @@
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2)	+= dahdi_echocan_sec2.o
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1)	+= dahdi_echocan_kb1.o
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2)	+= dahdi_echocan_mg2.o
+
+obj-m += $(DAHDI_MODULES_EXTRA)
 
 CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)