summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-17 16:16:23 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-08-17 16:16:23 +0000
commit2efdfd8aa9281f7179801e79b504b6df9ee379d6 (patch)
tree92eae7081432cd33ff53fcf200b046a936227881 /Makefile
parent13685d47b5dee607c722308c8e630535dc90f99f (diff)
Fix building extra modules in subdirectories.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2878 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b4efbca..41791f9 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ endif
# for building extra modules in this directory without editing the
# Makefiles:
-# running: make MODULES_EXTRA=mod1 mod2 subdir1/ subdir2/"
+# running: make MODULES_EXTRA="mod1 mod2" SUBDIRS_EXTRA="subdir1/ subdir2/"
# "subdir/" only works with kernel 2.6.
MODULES+=$(MODULES_EXTRA)
@@ -73,6 +73,10 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
+ifeq ($(BUILDVER),linux26)
+MODULESO+=$(SUBDIRS_EXTRA:%=%/)
+endif
+
# add this later, so it doesn't become part of MODULESO/MODULESKO
MODULES+=wct4xxp wctc4xxp wctdm24xxp