summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--README8
2 files changed, 9 insertions, 5 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
diff --git a/README b/README
index c9c04d3..3bb6fca 100644
--- a/README
+++ b/README
@@ -175,14 +175,14 @@ To build extra modules / modules directory not included in the Zaptel
distribution, use the optional variables MODULES_EXTRA and
SUBDIRS_EXTRA:
- make MODULES_EXTRA="mod1 mod2 subdir1/ subdir2/"
+ make MODULES_EXTRA="mod1 mod2"
+ make MODULES_EXTRA="mod1 mod2" SUBDIRS_EXTRA="subdir1/ subdir1/"
Note that those names are not guaranteed to continue to work on newer
-versions (in fact, it is slightly different on 1.4). Hopefully there will
-be no need for such extra configuration.
+versions. Hopefully there will be no need for such extra configuration.
Partial Build/Install
-^^^^^^^^^^^^^^^~~~~~~
+^^^^^^^^^^^^^^^^^^^^^
There are some make targets that are provided to build or install just
parts of Zaptel: